From 482809df6ed24af12a405344cf0f1228fa49585c Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Fri, 3 Oct 2025 18:16:42 +0800 Subject: [PATCH] [ci skip]fix: fix default translations support --- .../features/0020-I18n-support.patch | 12 ++++++++++-- .../java/fun/bm/lophine/utils/ServerI18nUtil.java | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lophine-server/minecraft-patches/features/0020-I18n-support.patch b/lophine-server/minecraft-patches/features/0020-I18n-support.patch index 09541f3..c816d41 100644 --- a/lophine-server/minecraft-patches/features/0020-I18n-support.patch +++ b/lophine-server/minecraft-patches/features/0020-I18n-support.patch @@ -5,10 +5,18 @@ Subject: [PATCH] I18n support diff --git a/net/minecraft/locale/Language.java b/net/minecraft/locale/Language.java -index 7b9e2a1a208b46a69c16e6afd8b502259893574f..db46a31ea8a36562e548eb07f0c4cf9b9e8c3360 100644 +index 7b9e2a1a208b46a69c16e6afd8b502259893574f..c300ae4363298fecef8fa9bf739f01c0a11e145f 100644 --- a/net/minecraft/locale/Language.java +++ b/net/minecraft/locale/Language.java -@@ -65,7 +65,7 @@ public abstract class Language { +@@ -36,6 +36,7 @@ public abstract class Language { + Map map = new HashMap<>(); + BiConsumer biConsumer = map::put; + parseTranslations(biConsumer, "/assets/minecraft/lang/en_us.json"); ++ fun.bm.lophine.utils.ServerI18nUtil.loadLophineI18nDefault(biConsumer); + deprecatedTranslationsInfo.applyToMap(map); + final Map map1 = Map.copyOf(map); + return new Language() { +@@ -65,7 +66,7 @@ public abstract class Language { }; } 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 2e6da79..5301651 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 @@ -6,9 +6,9 @@ import com.google.gson.JsonParser; import com.google.gson.JsonSyntaxException; import com.mojang.logging.LogUtils; import fun.bm.lophine.config.modules.function.LanguageConfig; +import io.papermc.paper.ServerBuildInfo; import me.earthme.luminol.config.ConfigManager; import me.earthme.luminol.config.ConfigsInstance; -import net.minecraft.SharedConstants; import net.minecraft.locale.DeprecatedTranslationsInfo; import net.minecraft.locale.Language; import net.minecraft.network.chat.FormattedText; @@ -41,7 +41,7 @@ import java.util.function.BiConsumer; */ public class ServerI18nUtil { private static final Logger logger = LogUtils.getClassLogger(); - private static final String VERSION = SharedConstants.getCurrentVersion().name(); + private static final String VERSION = ServerBuildInfo.buildInfo().minecraftVersionId(); private static final String BASE_PATH = "cache/lophine/" + VERSION + "/"; private static final String defaultLophineLangPath = "/assets/lophine/lang/en_us.json"; private static final String manifestUrl = "https://launchermeta.mojang.com/mc/game/version_manifest.json";