From 9c73b646309e961c9b927c32695bc52372ba2f8d Mon Sep 17 00:00:00 2001 From: altrisi Date: Tue, 9 Aug 2022 22:03:56 +0200 Subject: [PATCH] Revert "Fix language fallbacks for rules not being available early" This reverts commit 5a4ceb68c6980ad1d1ced6e664e8c15b5334615a. --- src/main/java/carpet/api/settings/SettingsManager.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/carpet/api/settings/SettingsManager.java b/src/main/java/carpet/api/settings/SettingsManager.java index 9eb9c148..c79189b6 100644 --- a/src/main/java/carpet/api/settings/SettingsManager.java +++ b/src/main/java/carpet/api/settings/SettingsManager.java @@ -174,6 +174,8 @@ public class SettingsManager { */ public void parseSettingsClass(Class settingsClass) { + // In the current translation system languages are not loaded this early. Ensure they are loaded + Translations.updateLanguage(); boolean warned = settingsClass == CarpetSettings.class; // don't warn for ourselves nextRule: for (Field field : settingsClass.getDeclaredFields()) @@ -210,10 +212,6 @@ public class SettingsManager { CarpetRule parsed = ParsedRule.of(field, this); rules.put(parsed.name(), parsed); } - // In the current translation system languages are not loaded this early. Ensure they are loaded - // after we've added fallbacks, else early systems such as the rule printer won't function for - // legacy rules given the validator (that triggers adding fallbacks normally) won't have ran - Translations.updateLanguage(); } /**