From 087b2b678d51782f0d6bd64db8a2acd7608c8ee7 Mon Sep 17 00:00:00 2001 From: Glavo Date: Wed, 4 Nov 2026 22:23:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=B3=95=E6=AD=A3?= =?UTF-8?q?=E5=B8=B8=E5=90=AF=E5=8A=A8=20Minecraft=2013w16a~13w23b=20?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20(#7193)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jackhuang/hmcl/game/HMCLGameLauncher.java | 6 ++++++ .../jackhuang/hmcl/launch/DefaultLauncher.java | 16 +++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameLauncher.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameLauncher.java index 8c27cb2fc8..0d7673dc71 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameLauncher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameLauncher.java @@ -91,6 +91,12 @@ public final class HMCLGameLauncher extends DefaultLauncher { if (gameVersion == GameVersionNumber.unknown() || gameVersion.compareTo("1.1") < 0) return; + // These snapshots lack the external language resources needed for non-English locales. + // Selecting an unavailable language causes a NullPointerException during startup. + if (gameVersion instanceof GameVersionNumber.LegacySnapshot + && gameVersion.compareTo("13w16a") >= 0 && gameVersion.compareTo("13w23b") <= 0) + return; + String lang = normalizedLanguageTag(locale, gameVersion); if (lang.isEmpty()) return; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java index 0704e5f120..741f0d5080 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java @@ -409,11 +409,17 @@ public class DefaultLauncher extends Launcher { return new Command(res, tempNativeFolder, javaNativeFolder, encoding); } - public Map getFeatures() { - return Collections.singletonMap( - "has_custom_resolution", - options.getHeight() != null && options.getHeight() != 0 && options.getWidth() != null && options.getWidth() != 0 - ); + /// Returns the feature flags used to evaluate conditional game arguments. + /// The `has_custom_resolution` flag is enabled when both dimensions are non-null and nonzero + /// and the game version is at least `1.6` (snapshot `13w25a`). + /// + /// @return an unmodifiable snapshot containing the custom resolution flag + public @Unmodifiable Map getFeatures() { + boolean hasCustomResolution = options.getHeight() != null && options.getHeight() != 0 + && options.getWidth() != null && options.getWidth() != 0 + && instance.getVersion().isAtLeast("1.6", "13w25a"); + + return Collections.singletonMap("has_custom_resolution", hasCustomResolution); } private final Map> forbiddens = mapOf(