Skip invalid translation keys instead of disabling resourcepack (#178)

* Skip invalid translation keys instead of crashing the game Closes #177 * Fix import order
Legacy-Fabric · Jul 31, 2024 · 6a75296 · 6a75296
1 parent 110dc1f
commit 6a75296
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...src/main/java/net/legacyfabric/fabric/impl/resource/loader/ResourceManagerHelperImpl.java b/...src/main/java/net/legacyfabric/fabric/impl/resource/loader/ResourceManagerHelperImpl.java
@@ -35,7 +35,7 @@
 
 public class ResourceManagerHelperImpl implements ResourceManagerHelper {
 	private static final ResourceManagerHelperImpl INSTANCE = new ResourceManagerHelperImpl();
-	private static final Logger LOGGER = Logger.get(LoggerImpl.API, "ResourceManagerHelperImpl");
+	public static final Logger LOGGER = Logger.get(LoggerImpl.API, "ResourceManagerHelperImpl");
 
 	private final Set<Identifier> addedListenerIds = new HashSet<>();
 	private final Set<IdentifiableResourceReloadListener> addedListeners = new LinkedHashSet<>();

diff --git a/...in/java/net/legacyfabric/fabric/mixin/resource/loader/client/TranslationStorageMixin.java b/...in/java/net/legacyfabric/fabric/mixin/resource/loader/client/TranslationStorageMixin.java
@@ -47,6 +47,7 @@
 import net.minecraft.util.Identifier;
 
 import net.legacyfabric.fabric.api.util.VersionUtils;
+import net.legacyfabric.fabric.impl.resource.loader.ResourceManagerHelperImpl;
 
 @Mixin(TranslationStorage.class)
 public abstract class TranslationStorageMixin {
@@ -148,7 +149,13 @@ private void recursiveLoadTranslations(@NotNull String currentKey, JsonObject ob
 					key = entry.getKey();
 				}
 
-				this.translations.put(key, TOKEN_PATTERN.matcher(entry.getValue().getAsString()).replaceAll("%$1s"));
+				JsonElement value = entry.getValue();
+
+				if (value.isJsonPrimitive()) {
+					this.translations.put(key, TOKEN_PATTERN.matcher(value.getAsString()).replaceAll("%$1s"));
+				} else {
+					ResourceManagerHelperImpl.LOGGER.warn("Skipping translation key \"" + key + "\" with unsupported format " + value);
+				}
 			}
 		}
 	}