diff --git a/gradle.properties b/gradle.properties index 634d37c..5c6e558 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ apiVersion=1.21.11 release=2 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=aee26e2fb9a2477588fe245531c1a0e0deb014c6 +luminolRef=e5ff8dff2fcfb6a8900bd87ed40ae9d4102c0c75 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch b/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch index 7fb7790..fb7c22e 100644 --- a/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch +++ b/lophine-server/luminol-patches/features/0001-Rebrand-to-Lophine.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Rebrand to Lophine diff --git a/src/main/java/me/earthme/luminol/config/ConfigManager.java b/src/main/java/me/earthme/luminol/config/ConfigManager.java -index 0bebc2cc87fb9c1c526e4de4f3bc157552307a72..cb1657939b86c039fcfe6403d3f202c2c5879e88 100644 +index 490316c7d5cbb77e988039cfa7a7cc0aa3849730..f5fb4e210c07f32e52eb8c1ba166d1571a6778c7 100644 --- a/src/main/java/me/earthme/luminol/config/ConfigManager.java +++ b/src/main/java/me/earthme/luminol/config/ConfigManager.java -@@ -23,6 +23,7 @@ public class ConfigManager { +@@ -24,6 +24,7 @@ public class ConfigManager { public static void initConfigs() { configfiles.put("luminol", ConfigsInstance.of("luminol", "me.earthme.luminol.config.modules")); -+ configfiles.put("lophine", ConfigsInstance.of("lophine", "fun.bm.lophine.config.modules")); // add lophine config to global config ++ configfiles.put("lophine", ConfigsInstance.of("lophine", "fun.bm.lophine.config.modules")); // add lophine global config preLoad(); } diff --git a/lophine-server/src/main/java/fun/bm/lophine/utils/ServerI18nUtil.java b/lophine-server/src/main/java/fun/bm/lophine/utils/ServerI18nUtil.java index d132ef1..cd0156c 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/utils/ServerI18nUtil.java +++ b/lophine-server/src/main/java/fun/bm/lophine/utils/ServerI18nUtil.java @@ -82,7 +82,7 @@ public class ServerI18nUtil { } catch (UnsupportedLanguageException e) { logger.warn("Unsupported language: {}", LanguageConfig.lang); // Fallback to English - final ConfigsInstance configsInstance = ConfigManager.configfiles.get("lophine"); + final ConfigsInstance configsInstance = ConfigManager.getConfigs("lophine"); configsInstance.setConfig(new String[]{"function", "language", "lang"}, "en_us"); configsInstance.reloadAsync(true); } catch (Exception e) {