Merge branch 'refs/heads/master' into 1.21.1

# Conflicts: # gradle.properties
Jerozgen · Oct 28, 2024 · 6009273 · 6009273
2 parents d57ce9b + 74e4c3b
commit 6009273
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.16.7
 fabric_version=0.106.0+1.21.1
 
 # Mod Properties
-mod_version=1.7+1.21.1
+mod_version=1.7.1+1.21.1
 maven_group=jerozgen
 archives_base_name=language-reload
 

diff --git a/src/main/java/jerozgen/languagereload/mixin/SearchManagerMixin.java b/src/main/java/jerozgen/languagereload/mixin/SearchManagerMixin.java
@@ -29,7 +29,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;