Force reading to recognize that our lang file is UTF-8 by making the …

…first value be a UTF-8 character
mekanism · Feb 29, 2024 · 47aeca7 · 47aeca7
1 parent fe1c679
commit 47aeca7
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55 b/src/datagen/generated/mekanism/.cache/c10fcd8abbb6a520fc3ac2cf14b627d36958dd55
@@ -1,5 +1,5 @@
-// 1.20.4	2024-02-28T21:26:49.3914969	Languages: en_us for mod: mekanism
+// 1.20.4	2024-02-28T21:51:26.6760057	Languages: en_us for mod: mekanism
 0e98b8c7cddc1a598c7667ea29f63dcf18723bbe assets/mekanism/lang/en_au.json
 0e98b8c7cddc1a598c7667ea29f63dcf18723bbe assets/mekanism/lang/en_gb.json
-817af7b8294e041a4650eab53d144f4364c00bbc assets/mekanism/lang/en_ud.json
-adfc00cc2e0b154de1066f14ec287c31471ab0b1 assets/mekanism/lang/en_us.json
+db92be4e30b15cf7d91a4a3da359cf87104ee6a8 assets/mekanism/lang/en_ud.json
+bb5e1a61469717bb41c007f9771c66e029ec7506 assets/mekanism/lang/en_us.json
diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_ud.json
@@ -811,9 +811,7 @@
   "direction.mekanism.east": "ʇsɐƎ",
   "direction.mekanism.east.short": "Ǝ",
   "direction.mekanism.north": "ɥʇɹoN",
-  "direction.mekanism.north.short": "N",
   "direction.mekanism.south": "ɥʇnoS",
-  "direction.mekanism.south.short": "S",
   "direction.mekanism.up": "d∩",
   "direction.mekanism.west": "ʇsǝM",
   "direction.mekanism.west.short": "M",

diff --git a/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json b/src/datagen/generated/mekanism/assets/mekanism/lang/en_us.json
@@ -1,4 +1,5 @@
-{
+{
+  "_mekanism_force_utf8": "",
   "advancements.mekanism.advanced_control_circuit.description": "Craft an Advanced Control Circuit",
   "advancements.mekanism.advanced_control_circuit.title": "He's Really Advanced For His Age",
   "advancements.mekanism.advanced_qio_drive.description": "Increase the storage bandwidth of your QIO Drive",

diff --git a/src/datagen/main/java/mekanism/client/lang/BaseLanguageProvider.java b/src/datagen/main/java/mekanism/client/lang/BaseLanguageProvider.java
@@ -109,7 +109,7 @@ public void add(@NotNull String key, @NotNull String value) {
         if (altProviders.length > 0) {
             List<Component> splitEnglish = FormatSplitter.split(value);
             for (ConvertibleLanguageProvider provider : altProviders) {
-                provider.convert(key, splitEnglish);
+                provider.convert(key, value, splitEnglish);
             }
         }
     }

diff --git a/src/datagen/main/java/mekanism/client/lang/ConvertibleLanguageProvider.java b/src/datagen/main/java/mekanism/client/lang/ConvertibleLanguageProvider.java
@@ -11,7 +11,7 @@ public ConvertibleLanguageProvider(PackOutput output, String modid, String local
         super(output, modid, locale);
     }
 
-    public abstract void convert(String key, List<Component> splitEnglish);
+    public abstract void convert(String key, String raw, List<Component> splitEnglish);
 
     @Override
     protected void addTranslations() {

diff --git a/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java b/src/datagen/main/java/mekanism/client/lang/MekanismLangProvider.java
@@ -617,6 +617,7 @@ private void addJadeConfigTooltip(ResourceLocation location, String value) {
     }
 
     private void addMisc() {
+        add("_mekanism_force_utf8", "\ufeff");
         addJade();
         //Upgrades
         add(APILang.UPGRADE_SPEED, "Speed");

diff --git a/src/datagen/main/java/mekanism/client/lang/NonAmericanLanguageProvider.java b/src/datagen/main/java/mekanism/client/lang/NonAmericanLanguageProvider.java
@@ -46,7 +46,7 @@ public NonAmericanLanguageProvider(PackOutput output, String modid, String local
     }
 
     @Override
-    public void convert(String key, List<Component> splitEnglish) {
+    public void convert(String key, String raw, List<Component> splitEnglish) {
         StringBuilder builder = new StringBuilder();
         boolean foundMatch = false;
         for (Component component : splitEnglish) {

diff --git a/src/datagen/main/java/mekanism/client/lang/UpsideDownLanguageProvider.java b/src/datagen/main/java/mekanism/client/lang/UpsideDownLanguageProvider.java
@@ -17,8 +17,11 @@ public UpsideDownLanguageProvider(PackOutput output, String modid) {
     }
 
     @Override
-    public void convert(String key, List<Component> splitEnglish) {
-        add(key, convertComponents(splitEnglish));
+    public void convert(String key, String raw, List<Component> splitEnglish) {
+        String upsideDown = convertComponents(splitEnglish);
+        if (!raw.equals(upsideDown)) {
+            add(key, upsideDown);
+        }
     }
 
     private static final String normal = "abcdefghijklmnopqrstuvwxyz" +