mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
90080d238e
--------- Co-authored-by: Lumine1909 <133463833+Lumine1909@users.noreply.github.com> Co-authored-by: violetc <58360096+s-yh-china@users.noreply.github.com> Co-authored-by: Helvetica Volubi <88063803+Suisuroru@users.noreply.github.com>
53 lines
2.8 KiB
Diff
53 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
|
Date: Thu, 12 Jun 2025 12:55:12 +0800
|
|
Subject: [PATCH] Leaves I18n support
|
|
|
|
|
|
diff --git a/net/minecraft/locale/Language.java b/net/minecraft/locale/Language.java
|
|
index 7b9e2a1a208b46a69c16e6afd8b502259893574f..8ef3627217a8c495e4e31b70e61ad1b78d988278 100644
|
|
--- a/net/minecraft/locale/Language.java
|
|
+++ b/net/minecraft/locale/Language.java
|
|
@@ -36,6 +36,7 @@ public abstract class Language {
|
|
Map<String, String> map = new HashMap<>();
|
|
BiConsumer<String, String> biConsumer = map::put;
|
|
parseTranslations(biConsumer, "/assets/minecraft/lang/en_us.json");
|
|
+ org.leavesmc.leaves.util.ServerI18nUtil.loadLeavesI18nDefault(biConsumer); // Leaves I18n
|
|
deprecatedTranslationsInfo.applyToMap(map);
|
|
final Map<String, String> map1 = Map.copyOf(map);
|
|
return new Language() {
|
|
@@ -65,7 +66,7 @@ public abstract class Language {
|
|
};
|
|
}
|
|
|
|
- private static void parseTranslations(BiConsumer<String, String> output, String languagePath) {
|
|
+ public static void parseTranslations(BiConsumer<String, String> output, String languagePath) { // private -> public
|
|
try (InputStream resourceAsStream = Language.class.getResourceAsStream(languagePath)) {
|
|
loadFromJson(resourceAsStream, output);
|
|
} catch (JsonParseException | IOException var7) {
|
|
diff --git a/net/minecraft/server/Main.java b/net/minecraft/server/Main.java
|
|
index 30b681bc234eac8dc44ce3bf6e228171f5a71a7a..e7a4a977cd1dcdbdeb163016ff30346bc3289f99 100644
|
|
--- a/net/minecraft/server/Main.java
|
|
+++ b/net/minecraft/server/Main.java
|
|
@@ -152,6 +152,8 @@ public class Main {
|
|
return;
|
|
}
|
|
|
|
+ org.leavesmc.leaves.util.ServerI18nUtil.preInit(); // Leaves I18n
|
|
+
|
|
// Paper start - Detect headless JRE
|
|
String awtException = io.papermc.paper.util.ServerEnvironment.awtDependencyCheck();
|
|
if (awtException != null) {
|
|
diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
|
|
index 677ad1a39e76efc98fc3b953ad66b329184612e0..51400ef2db6e93bfa032108f72687cddfc60c88e 100644
|
|
--- a/net/minecraft/server/dedicated/DedicatedServer.java
|
|
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
|
|
@@ -280,6 +280,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
|
|
|
org.leavesmc.leaves.LeavesConfig.init((java.io.File) options.valueOf("leaves-settings")); // Leaves - Server Config
|
|
this.getBotList().loadResumeBotInfo(); // Leaves - load resident bot info
|
|
+ org.leavesmc.leaves.util.ServerI18nUtil.init(); // Leaves I18n
|
|
|
|
com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics // Leaves - down
|
|
|