From 5db8ec4bd94cd49444fe3ad8f65ba21808dfa928 Mon Sep 17 00:00:00 2001 From: Helvetica Volubi Date: Fri, 3 Oct 2025 16:57:09 +0800 Subject: [PATCH] fix: pre fix a bug in I18n (will cause bug in 1.21.9) --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- lophine-server/build.gradle.kts.patch | 4 ++-- .../bm/lophine/config/modules/experiment/CommandConfig.java | 2 +- .../src/main/java/fun/bm/lophine/utils/ServerI18nUtil.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 85c99a8..79f4ab9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ mcVersion=1.21.8 release=2 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=e92a696b62d759bb96cb27f9553611a6621fb535 +luminolRef=86f404b196a7b615ef7c96e6e38fc4506367aaf3 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a84e18..2e11132 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/lophine-server/build.gradle.kts.patch b/lophine-server/build.gradle.kts.patch index b6646a5..aafb919 100644 --- a/lophine-server/build.gradle.kts.patch +++ b/lophine-server/build.gradle.kts.patch @@ -51,7 +51,7 @@ // Luminol start - Dependenices insert implementation("com.electronwill.night-config:toml:3.8.2") // Night config implementation("com.github.luben:zstd-jni:1.5.4-1") -@@ -276,14 +_,14 @@ +@@ -275,14 +_,14 @@ val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", @@ -70,7 +70,7 @@ "Build-Number" to (build ?: ""), "Build-Time" to buildTime.toString(), "Git-Branch" to gitBranch, -@@ -447,7 +_,7 @@ +@@ -446,7 +_,7 @@ } fill { diff --git a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java index 2edaf48..956f3db 100644 --- a/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java +++ b/lophine-server/src/main/java/fun/bm/lophine/config/modules/experiment/CommandConfig.java @@ -30,7 +30,7 @@ public class CommandConfig implements IConfigModule { """ Allow to use waypoint command""") public static boolean waypoint = false; - + @ConfigInfo(name = "scoreboard_command_enabled", comments = """ Allow to use scoreboard command""") 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 f5e5f32..2e6da79 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 @@ -8,7 +8,7 @@ import com.mojang.logging.LogUtils; import fun.bm.lophine.config.modules.function.LanguageConfig; import me.earthme.luminol.config.ConfigManager; import me.earthme.luminol.config.ConfigsInstance; -import net.minecraft.DetectedVersion; +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 = DetectedVersion.BUILT_IN.name(); + private static final String VERSION = SharedConstants.getCurrentVersion().name(); 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";