Merge branch 'refs/heads/master' into 1.20.2

# Conflicts: # gradle.properties
Jerozgen · Oct 28, 2024 · 78c7213 · 78c7213
2 parents 51b970c + 74e4c3b
commit 78c7213
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ loader_version=0.15.11
 fabric_version=0.91.6+1.20.2
 
 # Mod Properties
-mod_version=1.7+1.20.2
+mod_version=1.7.1+1.20.2
 maven_group=jerozgen
 archives_base_name=language-reload
 

diff --git a/src/main/java/jerozgen/languagereload/mixin/MinecraftClientMixin.java b/src/main/java/jerozgen/languagereload/mixin/MinecraftClientMixin.java
@@ -27,7 +27,10 @@ private static List<Text> addFallbackTranslationsToSearchTooltips(ItemStack inst
         if (Config.getInstance() == null) return original;
         if (!Config.getInstance().multilingualItemSearch) return original;
 
-        var translationStorage = ((ILanguage) Language.getInstance()).languagereload_getTranslationStorage();
+        var language = Language.getInstance();
+        if (language == null) return original;
+
+        var translationStorage = ((ILanguage) language).languagereload_getTranslationStorage();
         if (translationStorage == null) return original;
 
         var result = new ArrayList<>(original);

diff --git a/src/main/java/jerozgen/languagereload/mixin/TranslatableTextContentMixin.java b/src/main/java/jerozgen/languagereload/mixin/TranslatableTextContentMixin.java
@@ -45,6 +45,8 @@ List<StringVisitable> getOverriddenTranslations() {
         if (!Config.getInstance().multilingualItemSearch) return null;
 
         var language = Language.getInstance();
+        if (language == null) return null;
+
         var translationStorage = ((ILanguage) language).languagereload_getTranslationStorage();
         if (translationStorage == null) return null;