nachonekoawa/Lophine
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix some bugs in local lang

Browse Source
This commit is contained in:
Helvetica Volubi
2025-06-12 22:21:15 +08:00
parent 19b773d256
commit cf491363f6
3 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lophine-server/minecraft-patches/features/0001-Rebrand-to-Lophine.patch
+2 -3
View File
@@ -5,16 +5,15 @@ Subject: [PATCH] Rebrand to Lophine
diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
index fcf599846a38beeb8f094d5376c01d5a690f7a2f..9ddcb2b5ced68ff619516ddbac2327c23e316438 100644
index fcf599846a38beeb8f094d5376c01d5a690f7a2f..a70c04dc72a15e4e8de8de677951f1eb605057b0 100644
--- a/net/minecraft/server/Main.java
+++ b/net/minecraft/server/Main.java
@@ -108,7 +108,8 @@ public class Main {
@@ -108,7 +108,7 @@ public class Main {
JvmProfiler.INSTANCE.start(Environment.SERVER);
}
- me.earthme.luminol.config.LuminolConfig.preLoadConfig(); // Luminol - Luminol config
+ me.earthme.lophine.config.LophineConfig.initConfigs(); // Lophine - Lophine config
+ me.earthme.lophine.config.LophineConfig.preLoad(); // Luminol - Luminol config // Lophine - Lophine config
io.papermc.paper.plugin.PluginInitializerManager.load(optionSet); // Paper
Bootstrap.bootStrap();
Bootstrap.validate();
lophine-server/paper-patches/files/src/main/java/me/earthme/lophine/config/LophineConfig.java.patch
+3 -2
View File
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/src/main/java/me/earthme/lophine/config/LophineConfig.java
@@ -1,0 +_,32 @@
@@ -1,0 +_,33 @@
+package me.earthme.lophine.config;
+
+import me.earthme.luminol.config.LuminolConfig;
@@ -15,9 +15,10 @@
+ private static final File luminolConfigFolder = new File("luminol_config");
+ private static final File lophineConfigFolder = new File("lophine_config");
+
+ public static void initConfigs() {
+ public static void initConfigs() throws IOException {
+ configfiles.put("luminol", new LuminolConfig(luminolConfigFolder, "luminol", "me.earthme.luminol.config.modules"));
+ configfiles.put("lophine", new LuminolConfig(lophineConfigFolder, "lophine", "me.earthme.lophine.config.modules"));
+ preLoad();
+ }
+
+ public static void preLoad() throws IOException {
lophine-server/paper-patches/files/src/main/java/me/earthme/lophine/utils/LocalLangUtil.java.patch
+25 -15
View File
@@ -1,6 +1,6 @@
--- /dev/null
+++ b/src/main/java/me/earthme/lophine/utils/LocalLangUtil.java
@@ -1,0 +_,257 @@
@@ -1,0 +_,267 @@
+package me.earthme.lophine.utils;
+
+import com.google.gson.JsonElement;
@@ -33,27 +33,29 @@
+ final static String VERSION = "1.21.5";
+ final static String basePath = "cache/lophine/" + VERSION + "/";
+ static String lang = me.earthme.lophine.config.modules.optimizations.LanguageConfig.lang;
+ static boolean isReloading = false;
+
+ public static void init() {
+ init(true);
+ }
+
+ public static void init(boolean init) {
+ if (Objects.equals(lang, "en_us")) return;
+ CompletableFuture.runAsync(() -> {
+ try {
+ String path = basePath + "lang/" + lang + ".json";
+ if (!Files.exists(Path.of(path))) downloadLangAndCheck();
+ if (!Files.exists(Path.of(path))) {
+ downloadLangAndCheck();
+ }
+ try {
+ loadLocalLang(path);
+ isReloading = false;
+ loadLocalLang(path, init);
+ } catch (JsonParseException e) {
+ cleanCache();
+ if (!isReloading) {
+ isReloading = true;
+ init();
+ if (init) {
+ init(false);
+ }
+ }
+ } catch (Exception e) {
+ logger.severe(() -> "Async initialization failed: " + e.getMessage());
+ isReloading = false;
+ }
+ });
+ }
@@ -199,16 +201,21 @@
+ return JsonParser.parseString(new String(data)).getAsJsonObject();
+ }
+
+ public static void loadLocalLang(String lang) {
+ public static void loadLocalLang(String lang, boolean init) throws IOException {
+ try {
+ Language.inject(load(lang));
+ } catch (Exception e) {
+ logger.warning("Failed to load language file for " + lang + "\n" + e);
+ Language.inject(Language.loadDefault());
+ logger.info("Load default en_us instead of local lang " + lang);
+ if (init) {
+ throw e;
+ } else {
+ Language.inject(Language.loadDefault());
+ }
+ }
+ }
+
+ private static Language load(String lang) {
+ private static Language load(String lang) throws IOException {
+ DeprecatedTranslationsInfo deprecatedTranslationsInfo = DeprecatedTranslationsInfo.loadFromDefaultResource();
+ Map<String, String> map = new HashMap<>();
+ BiConsumer<String, String> biConsumer = map::put;
@@ -243,18 +250,21 @@
+ };
+ }
+
+ public static void parseTranslations(BiConsumer<String, String> output, String languagePath) {
+ public static void parseTranslations(BiConsumer<String, String> output, String languagePath) throws IOException {
+ try {
+ java.nio.file.Path filePath = java.nio.file.Paths.get(languagePath);
+ try (InputStream fileStream = java.nio.file.Files.newInputStream(filePath)) {
+ Path filePath = Paths.get(languagePath);
+ try (InputStream fileStream = Files.newInputStream(filePath)) {
+ Language.loadFromJson(fileStream, output);
+ } catch (java.nio.file.NoSuchFileException fileEx) {
+ logger.warning("Language file not found in both locations: " + languagePath);
+ throw fileEx;
+ } catch (Exception fileEx) {
+ logger.warning("Failed to load from filesystem " + filePath + "\n" + fileEx);
+ throw fileEx;
+ }
+ } catch (Exception ep) {
+ logger.warning("Couldn't read strings from " + languagePath + "\n" + ep);
+ throw ep;
+ }
+ }
+}