Make translation targets match languages more broadly

LoveTropics · Oct 30, 2023 · 9b6f6f1 · 9b6f6f1
1 parent 89bb092
commit 9b6f6f1
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/src/main/java/com/lovetropics/extras/mixin/translation/PlayerChatMessageMixin.java b/src/main/java/com/lovetropics/extras/mixin/translation/PlayerChatMessageMixin.java
@@ -1,10 +1,12 @@
 package com.lovetropics.extras.mixin.translation;
 
 import com.lovetropics.extras.translation.TranslatableChatMessage;
+import com.lovetropics.extras.translation.TranslatableLanguage;
 import com.lovetropics.extras.translation.TranslationBundle;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.PlayerChatMessage;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -17,7 +19,7 @@ public abstract class PlayerChatMessageMixin implements TranslatableChatMessage
     public abstract String signedContent();
 
     @Unique
-    private final Map<String, String> ltextras$translations = new Object2ObjectOpenHashMap<>();
+    private final Map<TranslatableLanguage, String> ltextras$translations = new Object2ObjectOpenHashMap<>();
 
     @Override
     public void ltextras$addTranslations(final TranslationBundle bundle) {
@@ -27,7 +29,7 @@ public abstract class PlayerChatMessageMixin implements TranslatableChatMessage
     @Override
     public PlayerChatMessage ltextras$translate(final String language) {
         final PlayerChatMessage self = (PlayerChatMessage) (Object) this;
-        final String translation = ltextras$translations.get(language);
+        final String translation = lTExtras$getTranslationFor(language);
         if (translation != null && !translation.equals(signedContent())) {
             return self.withUnsignedContent(Component.literal(translation));
         }
@@ -36,7 +38,14 @@ public abstract class PlayerChatMessageMixin implements TranslatableChatMessage
 
     @Override
     public boolean ltextras$hasTranslationFor(final String language) {
-        final String translation = ltextras$translations.get(language);
+        final String translation = lTExtras$getTranslationFor(language);
         return translation != null && !translation.equals(signedContent());
     }
+
+    @Unique
+    @Nullable
+    private String lTExtras$getTranslationFor(final String language) {
+        final TranslatableLanguage languageType = TranslatableLanguage.byKey(language);
+        return languageType != null ? ltextras$translations.get(languageType) : null;
+    }
 }
diff --git a/src/main/java/com/lovetropics/extras/translation/TranslatableLanguage.java b/src/main/java/com/lovetropics/extras/translation/TranslatableLanguage.java
@@ -1,23 +1,22 @@
 package com.lovetropics.extras.translation;
 
-import net.minecraft.util.StringRepresentable;
+import javax.annotation.Nullable;
 
-public enum TranslatableLanguage implements StringRepresentable {
-    ENGLISH("en_us"),
-    SPANISH("es_es"),
-    FRENCH("fr_fr"),
+public enum TranslatableLanguage {
+    ENGLISH,
+    SPANISH,
+    FRENCH,
     ;
 
-    public static final EnumCodec<TranslatableLanguage> CODEC = StringRepresentable.fromEnum(TranslatableLanguage::values);
-
-    private final String key;
-
-    TranslatableLanguage(final String key) {
-        this.key = key;
-    }
-
-    @Override
-    public String getSerializedName() {
-        return key;
+    @Nullable
+    public static TranslatableLanguage byKey(final String key) {
+        if (key.startsWith("en_")) {
+            return ENGLISH;
+        } else if (key.startsWith("es_")) {
+            return SPANISH;
+        } else if (key.startsWith("fr_")) {
+            return FRENCH;
+        }
+        return null;
     }
 }
diff --git a/src/main/java/com/lovetropics/extras/translation/TranslationBundle.java b/src/main/java/com/lovetropics/extras/translation/TranslationBundle.java
@@ -2,6 +2,6 @@
 
 import java.util.Map;
 
-public record TranslationBundle(Map<String, String> stringsByLanguage) {
+public record TranslationBundle(Map<TranslatableLanguage, String> stringsByLanguage) {
     public static final TranslationBundle EMPTY = new TranslationBundle(Map.of());
 }
diff --git a/src/main/java/com/lovetropics/extras/translation/TranslationService.java b/src/main/java/com/lovetropics/extras/translation/TranslationService.java
@@ -37,9 +37,9 @@ private boolean isDisabled() {
     }
 
     public CompletableFuture<TranslationBundle> translate(final String language, final String text) {
-        final TranslatableLanguage languageType = TranslatableLanguage.CODEC.byName(language);
+        final TranslatableLanguage languageType = TranslatableLanguage.byKey(language);
         if (languageType == null || isDisabled()) {
-            return CompletableFuture.completedFuture(new TranslationBundle(Map.of(language, text)));
+            return CompletableFuture.completedFuture(TranslationBundle.EMPTY);
         }
         return switch (languageType) {
             case ENGLISH ->
@@ -58,15 +58,15 @@ public CompletableFuture<TranslationBundle> translate(final String language, fin
     }
 
     private static TranslationBundle createBundle(@Nullable final String english, @Nullable final String spanish, @Nullable final String french) {
-        final ImmutableMap.Builder<String, String> stringsByLanguage = ImmutableMap.builderWithExpectedSize(3);
+        final ImmutableMap.Builder<TranslatableLanguage, String> stringsByLanguage = ImmutableMap.builderWithExpectedSize(3);
         if (english != null) {
-            stringsByLanguage.put(TranslatableLanguage.ENGLISH.getSerializedName(), english);
+            stringsByLanguage.put(TranslatableLanguage.ENGLISH, english);
         }
         if (spanish != null) {
-            stringsByLanguage.put(TranslatableLanguage.SPANISH.getSerializedName(), spanish);
+            stringsByLanguage.put(TranslatableLanguage.SPANISH, spanish);
         }
         if (french != null) {
-            stringsByLanguage.put(TranslatableLanguage.FRENCH.getSerializedName(), french);
+            stringsByLanguage.put(TranslatableLanguage.FRENCH, french);
         }
         return new TranslationBundle(stringsByLanguage.build());
     }