Helvetica Volubi
53 lines
3.0 KiB
Diff
53 lines
3.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Helvetica Volubi <suisuroru@blue-millennium.fun>
|
|
Date: Thu, 12 Jun 2025 04:44:24 +0800
|
|
Subject: [PATCH] I18n support
|
|
|
|
|
|
diff --git a/net/minecraft/locale/Language.java b/net/minecraft/locale/Language.java
|
|
index 7b9e2a1a208b46a69c16e6afd8b502259893574f..c300ae4363298fecef8fa9bf739f01c0a11e145f 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");
|
|
+ fun.bm.lophine.utils.ServerI18nUtil.loadLophineI18nDefault(biConsumer);
|
|
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) { // Lophine - 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 cf72cb8b418239b56c755486b03a321672e16bc3..b69c06607ca900beeebf4892a978442dad2db19b 100644
|
|
--- a/net/minecraft/server/Main.java
|
|
+++ b/net/minecraft/server/Main.java
|
|
@@ -155,6 +155,8 @@ public class Main {
|
|
return;
|
|
}
|
|
|
|
+ fun.bm.lophine.utils.ServerI18nUtil.preInit(); // Lophine - I18n support
|
|
+
|
|
// 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 c93feb64b6088a4878fcdb6e7c733a5f37e9385b..79c911003c7b1c3d94e7e9d3974eeadcc16bde3a 100644
|
|
--- a/net/minecraft/server/dedicated/DedicatedServer.java
|
|
+++ b/net/minecraft/server/dedicated/DedicatedServer.java
|
|
@@ -172,6 +172,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
|
this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
|
|
// Paper end - initialize global and world-defaults configuration
|
|
me.earthme.luminol.config.ConfigManager.loadConfigFiles(); // Luminol - load config file
|
|
+ fun.bm.lophine.utils.ServerI18nUtil.init(); // Lophine - I18n support
|
|
if (false) this.server.spark.enableEarlyIfRequested(); // Paper - spark // Luminol - Force disable builtin spark
|
|
// Paper start - fix converting txt to json file; convert old users earlier after PlayerList creation but before file load/save
|
|
if (this.convertOldUsers()) {
|