Merge branch 'refs/heads/master' into 1.20.1

# Conflicts: # gradle.properties
Jerozgen · May 14, 2024 · 5d0bd44 · 5d0bd44
2 parents ac9e30d + 413fb34
commit 5d0bd44
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ loader_version=0.15.11
 fabric_version=0.92.1+1.20.1
 
 # Mod Properties
-mod_version=1.6+1.20.1
+mod_version=1.6.1+1.20.1
 maven_group=jerozgen
 archives_base_name=language-reload
 

diff --git a/src/main/java/jerozgen/languagereload/config/Config.java b/src/main/java/jerozgen/languagereload/config/Config.java
@@ -6,6 +6,7 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.util.Language;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -19,6 +20,8 @@ public class Config {
 
     private static Config INSTANCE;
 
+    public int version = 0;
+
     public boolean multilingualItemSearch = true;
     public LinkedList<String> fallbacks = new LinkedList<>();
     public LinkedList<String> previousFallbacks = new LinkedList<>();
@@ -38,6 +41,8 @@ public static void load() {
             LanguageReload.LOGGER.error("Couldn't load config file: ", e);
         }
 
+        migrateToVersion1();
+
         if (INSTANCE.language.equals(LanguageReload.NO_LANGUAGE) && !INSTANCE.fallbacks.isEmpty()) {
             INSTANCE.language = INSTANCE.fallbacks.pollFirst();
         }
@@ -59,4 +64,21 @@ public static Config getInstance() {
         if (INSTANCE == null) load();
         return INSTANCE;
     }
+
+    private static void migrateToVersion1() {
+        if (INSTANCE.version >= 1) return;
+        INSTANCE.version = 1;
+
+        if (!INSTANCE.language.isEmpty()
+                && !INSTANCE.language.equals(Language.DEFAULT_LANGUAGE)
+                && !INSTANCE.fallbacks.contains(Language.DEFAULT_LANGUAGE))
+            INSTANCE.fallbacks.add(Language.DEFAULT_LANGUAGE);
+
+        if (!INSTANCE.previousLanguage.isEmpty()
+                && !INSTANCE.previousLanguage.equals(Language.DEFAULT_LANGUAGE)
+                && !INSTANCE.previousFallbacks.contains(Language.DEFAULT_LANGUAGE))
+            INSTANCE.previousFallbacks.add(Language.DEFAULT_LANGUAGE);
+
+        save();
+    }
 }