From cbd6d0c06764e85b8f3f5561e326692d8659328e Mon Sep 17 00:00:00 2001 From: Zkitefly <64117916+zkitefly@users.noreply.github.com> Date: Sat, 5 Apr 2025 18:03:53 +0800 Subject: [PATCH 01/11] Update NativePatcher.java --- .../jackhuang/hmcl/util/NativePatcher.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java index 211b7e274e..521728fa0f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java @@ -27,6 +27,8 @@ import org.jackhuang.hmcl.util.platform.OperatingSystem; import org.jackhuang.hmcl.util.platform.Platform; import org.jackhuang.hmcl.util.versioning.GameVersionNumber; +import org.jackhuang.hmcl.game.Library; +import org.jackhuang.hmcl.game.LibraryDownloadInfo; import java.io.IOException; import java.io.InputStreamReader; @@ -67,6 +69,30 @@ public static Version patchNative(DefaultGameRepository repository, JavaRuntime javaVersion, VersionSetting settings, List javaArguments) { + + // Add RetroWrapper for versions below 1.6 + if (gameVersion != null && GameVersionNumber.compare(gameVersion, "1.6") < 0) { + ArrayList libraries = new ArrayList<>(version.getLibraries()); + Library retroWrapper = new Library( + new Artifact("com.zero", "retrowrapper", "1.7.8"), + null, + new LibrariesDownloadInfo( + new LibraryDownloadInfo( + "com/zero/retrowrapper/1.7.8/retrowrapper-1.7.8.jar", + "https://zkitefly.github.io/unlisted-versions-of-minecraft/libraries/retrowrapper-1.7.8.jar", + "ea9175b4aebe091ae8859f7352fe59077a62bdf4", + 181263 + ) + ) + ); + libraries.add(retroWrapper); + version = version.setLibraries(libraries); + + // https://github.com/NeRdTheNed/RetroWrapper/wiki/RetroWrapper-flags + javaArguments.add("-Dretrowrapper.doUpdateCheck=false"); + javaArguments.add("-Dretrowrapper.enableFMLPatch=true"); + } + if (settings.getNativesDirType() == NativesDirectoryType.CUSTOM) { if (gameVersion != null && GameVersionNumber.compare(gameVersion, "1.19") < 0) return version; From e602fd441e12d33cb22f6e3f46351dd250925615 Mon Sep 17 00:00:00 2001 From: Zkitefly <64117916+zkitefly@users.noreply.github.com> Date: Sat, 19 Apr 2025 11:47:43 +0000 Subject: [PATCH 02/11] update --- .../jackhuang/hmcl/util/NativePatcher.java | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java index 521728fa0f..f26a29e6c4 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java @@ -72,25 +72,29 @@ public static Version patchNative(DefaultGameRepository repository, // Add RetroWrapper for versions below 1.6 if (gameVersion != null && GameVersionNumber.compare(gameVersion, "1.6") < 0) { - ArrayList libraries = new ArrayList<>(version.getLibraries()); - Library retroWrapper = new Library( - new Artifact("com.zero", "retrowrapper", "1.7.8"), - null, - new LibrariesDownloadInfo( - new LibraryDownloadInfo( - "com/zero/retrowrapper/1.7.8/retrowrapper-1.7.8.jar", - "https://zkitefly.github.io/unlisted-versions-of-minecraft/libraries/retrowrapper-1.7.8.jar", - "ea9175b4aebe091ae8859f7352fe59077a62bdf4", - 181263 - ) - ) - ); - libraries.add(retroWrapper); - version = version.setLibraries(libraries); - - // https://github.com/NeRdTheNed/RetroWrapper/wiki/RetroWrapper-flags - javaArguments.add("-Dretrowrapper.doUpdateCheck=false"); - javaArguments.add("-Dretrowrapper.enableFMLPatch=true"); + String minecraftArguments = version.getMinecraftArguments().orElse(null); + if (minecraftArguments != null && !minecraftArguments.contains("--tweakClass")) { + ArrayList libraries = new ArrayList<>(version.getLibraries()); + Library retroWrapper = new Library( + new Artifact("com.zero", "retrowrapper", "1.7.8"), + null, + new LibrariesDownloadInfo( + new LibraryDownloadInfo( + "com/zero/retrowrapper/1.7.8/retrowrapper-1.7.8.jar", + "https://zkitefly.github.io/unlisted-versions-of-minecraft/libraries/retrowrapper-1.7.8.jar", + "ea9175b4aebe091ae8859f7352fe59077a62bdf4", + 181263 + ) + ) + ); + libraries.add(retroWrapper); + version = version.setLibraries(libraries); + + javaArguments.add("-Dretrowrapper.doUpdateCheck=false"); + javaArguments.add("-Dretrowrapper.enableFMLPatch=true"); + + version = version.setMinecraftArguments(minecraftArguments + " --tweakClass com.zero.retrowrapper.RetroTweaker"); + } } if (settings.getNativesDirType() == NativesDirectoryType.CUSTOM) { From 756ad4002437347d5755ebc1f5d127da0e267f7d Mon Sep 17 00:00:00 2001 From: Zkitefly <64117916+zkitefly@users.noreply.github.com> Date: Sat, 19 Apr 2025 13:23:47 +0000 Subject: [PATCH 03/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hmcl/setting/VersionSetting.java | 16 +++++++ .../versions/AdvancedVersionSettingPage.java | 8 +++- .../jackhuang/hmcl/util/NativePatcher.java | 48 ++++++++++--------- 3 files changed, 48 insertions(+), 24 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java index 39fb1afd48..9624b417fb 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionSetting.java @@ -418,6 +418,20 @@ public void setNotPatchNatives(boolean notPatchNatives) { notPatchNativesProperty.set(notPatchNatives); } + private final BooleanProperty notUseRetroTweakerProperty = new SimpleBooleanProperty(this, "notUseRetroTweaker", false); + + public BooleanProperty notUseRetroTweakerProperty() { + return notUseRetroTweakerProperty; + } + + public boolean isNotUseRetroTweaker() { + return notUseRetroTweakerProperty.get(); + } + + public void setNotUseRetroTweaker(boolean notUseRetroTweaker) { + notUseRetroTweakerProperty.set(notUseRetroTweaker); + } + private final BooleanProperty showLogsProperty = new SimpleBooleanProperty(this, "showLogs", false); public BooleanProperty showLogsProperty() { @@ -750,6 +764,7 @@ public JsonElement serialize(VersionSetting src, Type typeOfSrc, JsonSerializati obj.addProperty("notCheckGame", src.isNotCheckGame()); obj.addProperty("notCheckJVM", src.isNotCheckJVM()); obj.addProperty("notPatchNatives", src.isNotPatchNatives()); + obj.addProperty("notUseRetroTweaker", src.isNotUseRetroTweaker()); obj.addProperty("showLogs", src.isShowLogs()); obj.addProperty("gameDir", src.getGameDir()); obj.addProperty("launcherVisibility", src.getLauncherVisibility().ordinal()); @@ -828,6 +843,7 @@ public VersionSetting deserialize(JsonElement json, Type typeOfT, JsonDeserializ vs.setNotCheckGame(Optional.ofNullable(obj.get("notCheckGame")).map(JsonElement::getAsBoolean).orElse(false)); vs.setNotCheckJVM(Optional.ofNullable(obj.get("notCheckJVM")).map(JsonElement::getAsBoolean).orElse(false)); vs.setNotPatchNatives(Optional.ofNullable(obj.get("notPatchNatives")).map(JsonElement::getAsBoolean).orElse(false)); + vs.setNotUseRetroTweaker(Optional.ofNullable(obj.get("notUseRetroTweaker")).map(JsonElement::getAsBoolean).orElse(false)); vs.setShowLogs(Optional.ofNullable(obj.get("showLogs")).map(JsonElement::getAsBoolean).orElse(false)); vs.setLauncherVisibility(getOrDefault(LauncherVisibility.values(), obj.get("launcherVisibility"), LauncherVisibility.HIDE)); vs.setProcessPriority(getOrDefault(ProcessPriority.values(), obj.get("processPriority"), ProcessPriority.NORMAL)); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AdvancedVersionSettingPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AdvancedVersionSettingPage.java index 1acaf3c9b9..231449e83f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AdvancedVersionSettingPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AdvancedVersionSettingPage.java @@ -45,6 +45,7 @@ public final class AdvancedVersionSettingPage extends StackPane implements Decor private final OptionToggleButton noGameCheckPane; private final OptionToggleButton noJVMCheckPane; private final OptionToggleButton noNativesPatchPane; + private final OptionToggleButton noUseRetroTweakerPane; private final OptionToggleButton useNativeGLFWPane; private final OptionToggleButton useNativeOpenALPane; private final ComponentSublist nativesDirSublist; @@ -191,6 +192,9 @@ public AdvancedVersionSettingPage(Profile profile, String versionId, VersionSett noNativesPatchPane = new OptionToggleButton(); noNativesPatchPane.setTitle(i18n("settings.advanced.dont_patch_natives")); + noUseRetroTweakerPane = new OptionToggleButton(); + noUseRetroTweakerPane.setTitle(i18n("settings.advanced.dont_use_retrowrapper")); + useNativeGLFWPane = new OptionToggleButton(); useNativeGLFWPane.setTitle(i18n("settings.advanced.use_native_glfw")); @@ -199,7 +203,7 @@ public AdvancedVersionSettingPage(Profile profile, String versionId, VersionSett workaroundPane.getContent().setAll( nativesDirSublist, rendererPane, noJVMArgsPane, noGameCheckPane, - noJVMCheckPane, noNativesPatchPane + noJVMCheckPane, noNativesPatchPane, noUseRetroTweakerPane ); if (OperatingSystem.CURRENT_OS.isLinuxOrBSD()) { @@ -235,6 +239,7 @@ void bindProperties() { noJVMCheckPane.selectedProperty().bindBidirectional(versionSetting.notCheckJVMProperty()); noJVMArgsPane.selectedProperty().bindBidirectional(versionSetting.noJVMArgsProperty()); noNativesPatchPane.selectedProperty().bindBidirectional(versionSetting.notPatchNativesProperty()); + noUseRetroTweakerPane.selectedProperty().bindBidirectional(versionSetting.notUseRetroTweakerProperty()); useNativeGLFWPane.selectedProperty().bindBidirectional(versionSetting.useNativeGLFWProperty()); useNativeOpenALPane.selectedProperty().bindBidirectional(versionSetting.useNativeOpenALProperty()); @@ -257,6 +262,7 @@ void unbindProperties() { noJVMCheckPane.selectedProperty().unbindBidirectional(versionSetting.notCheckJVMProperty()); noJVMArgsPane.selectedProperty().unbindBidirectional(versionSetting.noJVMArgsProperty()); noNativesPatchPane.selectedProperty().unbindBidirectional(versionSetting.notPatchNativesProperty()); + noUseRetroTweakerPane.selectedProperty().unbindBidirectional(versionSetting.notUseRetroTweakerProperty()); useNativeGLFWPane.selectedProperty().unbindBidirectional(versionSetting.useNativeGLFWProperty()); useNativeOpenALPane.selectedProperty().unbindBidirectional(versionSetting.useNativeOpenALProperty()); diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java index f26a29e6c4..434e982124 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java @@ -71,29 +71,31 @@ public static Version patchNative(DefaultGameRepository repository, List javaArguments) { // Add RetroWrapper for versions below 1.6 - if (gameVersion != null && GameVersionNumber.compare(gameVersion, "1.6") < 0) { - String minecraftArguments = version.getMinecraftArguments().orElse(null); - if (minecraftArguments != null && !minecraftArguments.contains("--tweakClass")) { - ArrayList libraries = new ArrayList<>(version.getLibraries()); - Library retroWrapper = new Library( - new Artifact("com.zero", "retrowrapper", "1.7.8"), - null, - new LibrariesDownloadInfo( - new LibraryDownloadInfo( - "com/zero/retrowrapper/1.7.8/retrowrapper-1.7.8.jar", - "https://zkitefly.github.io/unlisted-versions-of-minecraft/libraries/retrowrapper-1.7.8.jar", - "ea9175b4aebe091ae8859f7352fe59077a62bdf4", - 181263 - ) - ) - ); - libraries.add(retroWrapper); - version = version.setLibraries(libraries); - - javaArguments.add("-Dretrowrapper.doUpdateCheck=false"); - javaArguments.add("-Dretrowrapper.enableFMLPatch=true"); - - version = version.setMinecraftArguments(minecraftArguments + " --tweakClass com.zero.retrowrapper.RetroTweaker"); + if (!settings.isNotUseRetroTweaker()) { + if (gameVersion != null && GameVersionNumber.compare(gameVersion, "1.6") < 0) { + String minecraftArguments = version.getMinecraftArguments().orElse(null); + if (minecraftArguments != null && !minecraftArguments.contains("--tweakClass")) { + ArrayList libraries = new ArrayList<>(version.getLibraries()); + Library retroWrapper = new Library( + new Artifact("com.zero", "retrowrapper", "1.7.8"), + null, + new LibrariesDownloadInfo( + new LibraryDownloadInfo( + "com/zero/retrowrapper/1.7.8/retrowrapper-1.7.8.jar", + "https://zkitefly.github.io/unlisted-versions-of-minecraft/libraries/retrowrapper-1.7.8.jar", + "ea9175b4aebe091ae8859f7352fe59077a62bdf4", + 181263 + ) + ) + ); + libraries.add(retroWrapper); + version = version.setLibraries(libraries); + + javaArguments.add("-Dretrowrapper.doUpdateCheck=false"); + javaArguments.add("-Dretrowrapper.enableFMLPatch=true"); + + version = version.setMinecraftArguments(minecraftArguments + " --tweakClass com.zero.retrowrapper.RetroTweaker"); + } } } From 826d71ceba40b05c9ea5035b54aad98a03f8f842 Mon Sep 17 00:00:00 2001 From: Zkitefly <64117916+zkitefly@users.noreply.github.com> Date: Sat, 19 Apr 2025 13:31:57 +0000 Subject: [PATCH 04/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HMCL/src/main/resources/assets/lang/I18N.properties | 1 + HMCL/src/main/resources/assets/lang/I18N_zh.properties | 1 + HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties | 1 + 3 files changed, 3 insertions(+) diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 1c1d453a01..2d909dca33 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -1168,6 +1168,7 @@ settings.advanced.custom_commands.hint=The following environment variables are p settings.advanced.dont_check_game_completeness=Do not check game integrity settings.advanced.dont_check_jvm_validity=Do not check Java VM compatibility settings.advanced.dont_patch_natives=Do not attempt to automatically replace native libraries +settings.advanced.dont_use_retrowrapper=No NeRdTheNed/RetroWrapper patch (not used for versions greater than 1.6) settings.advanced.environment_variables=Environment Variables settings.advanced.game_dir.default=Default (".minecraft/") settings.advanced.game_dir.independent=Isolated (".minecraft/versions//", except for assets and libraries) diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index ba2fe55fb8..8210486c29 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -969,6 +969,7 @@ settings.advanced.custom_commands.hint=自訂指令被呼叫時將包含如下 settings.advanced.dont_check_game_completeness=不檢查遊戲完整性 settings.advanced.dont_check_jvm_validity=不檢查 JVM 與遊戲的相容性 settings.advanced.dont_patch_natives=不嘗試自動取代本機庫 +settings.advanced.dont_use_retrowrapper=不使用 NeRdTheNed-RetroWrapper 補丁（大於 1.6 版本不使用） settings.advanced.environment_variables=環境變數 settings.advanced.game_dir.default=預設 (".minecraft/") settings.advanced.game_dir.independent=各實例獨立 (".minecraft/versions/<實例名>/"，除 assets、libraries 外) diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties index 6b5950291a..0207dc8bf6 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -980,6 +980,7 @@ settings.advanced.custom_commands.hint=自定义命令被调用时将包含如 settings.advanced.dont_check_game_completeness=不检查游戏完整性 settings.advanced.dont_check_jvm_validity=不检查 JVM 与游戏的兼容性 settings.advanced.dont_patch_natives=不尝试自动替换本地库 +settings.advanced.dont_use_retrowrapper=不使用 NeRdTheNed/RetroWrapper 补丁（大于 1.6 版本不使用） settings.advanced.environment_variables=环境变量 settings.advanced.game_dir.default=默认 (".minecraft/") settings.advanced.game_dir.independent=各版本独立 (存放在 ".minecraft/versions/<版本名>/"，除 assets、libraries 外) From 415229730e7688cdcf564c81c2b71f35dd8c71b7 Mon Sep 17 00:00:00 2001 From: Zkitefly <64117916+zkitefly@users.noreply.github.com> Date: Sat, 19 Apr 2025 14:06:55 +0000 Subject: [PATCH 05/11] Update HMCL/src/main/resources/assets/lang/I18N.properties Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com> --- HMCL/src/main/resources/assets/lang/I18N.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index 2d909dca33..b187376e18 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -1168,7 +1168,7 @@ settings.advanced.custom_commands.hint=The following environment variables are p settings.advanced.dont_check_game_completeness=Do not check game integrity settings.advanced.dont_check_jvm_validity=Do not check Java VM compatibility settings.advanced.dont_patch_natives=Do not attempt to automatically replace native libraries -settings.advanced.dont_use_retrowrapper=No NeRdTheNed/RetroWrapper patch (not used for versions greater than 1.6) +settings.advanced.dont_use_retrowrapper=Do not use NeRd's RetroWrapper for Minecraft 1.5 and earlier (Minecraft 1.6 and later will not use it anyway) settings.advanced.environment_variables=Environment Variables settings.advanced.game_dir.default=Default (".minecraft/") settings.advanced.game_dir.independent=Isolated (".minecraft/versions//", except for assets and libraries) From 2bf057ba482f818dd96979d1c0e87380954a6b22 Mon Sep 17 00:00:00 2001 From: Zkitefly <64117916+zkitefly@users.noreply.github.com> Date: Sat, 19 Apr 2025 14:07:03 +0000 Subject: [PATCH 06/11] Update HMCL/src/main/resources/assets/lang/I18N_zh.properties Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com> --- HMCL/src/main/resources/assets/lang/I18N_zh.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index 8210486c29..b031032a92 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -969,7 +969,7 @@ settings.advanced.custom_commands.hint=自訂指令被呼叫時將包含如下 settings.advanced.dont_check_game_completeness=不檢查遊戲完整性 settings.advanced.dont_check_jvm_validity=不檢查 JVM 與遊戲的相容性 settings.advanced.dont_patch_natives=不嘗試自動取代本機庫 -settings.advanced.dont_use_retrowrapper=不使用 NeRdTheNed-RetroWrapper 補丁（大於 1.6 版本不使用） +settings.advanced.dont_use_retrowrapper=不使用 NeRd 的 RetroWrapper 修補程式（該修補程式默認僅會在 Minecraft 1.5 及以下版本使用） settings.advanced.environment_variables=環境變數 settings.advanced.game_dir.default=預設 (".minecraft/") settings.advanced.game_dir.independent=各實例獨立 (".minecraft/versions/<實例名>/"，除 assets、libraries 外) From bd6220c274885b268f19d91ed6463ac8f0660f14 Mon Sep 17 00:00:00 2001 From: Zkitefly <64117916+zkitefly@users.noreply.github.com> Date: Sat, 19 Apr 2025 14:07:09 +0000 Subject: [PATCH 07/11] Update HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Co-authored-by: 3gf8jv4dv <3gf8jv4dv@gmail.com> --- HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties index 0207dc8bf6..31e73e9667 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -980,7 +980,7 @@ settings.advanced.custom_commands.hint=自定义命令被调用时将包含如 settings.advanced.dont_check_game_completeness=不检查游戏完整性 settings.advanced.dont_check_jvm_validity=不检查 JVM 与游戏的兼容性 settings.advanced.dont_patch_natives=不尝试自动替换本地库 -settings.advanced.dont_use_retrowrapper=不使用 NeRdTheNed/RetroWrapper 补丁（大于 1.6 版本不使用） +settings.advanced.dont_use_retrowrapper=不使用 NeRd 的 RetroWrapper 补丁（该补丁默认仅会在 Minecraft 1.5 及以下版本使用） settings.advanced.environment_variables=环境变量 settings.advanced.game_dir.default=默认 (".minecraft/") settings.advanced.game_dir.independent=各版本独立 (存放在 ".minecraft/versions/<版本名>/"，除 assets、libraries 外) From 6f9ffc0af11076432522d91d36d6b88a1a292fcf Mon Sep 17 00:00:00 2001 From: Zkitefly <64117916+zkitefly@users.noreply.github.com> Date: Tue, 22 Apr 2025 22:06:54 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E5=85=B3?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java index 434e982124..6fb61a1261 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/NativePatcher.java @@ -92,8 +92,6 @@ public static Version patchNative(DefaultGameRepository repository, version = version.setLibraries(libraries); javaArguments.add("-Dretrowrapper.doUpdateCheck=false"); - javaArguments.add("-Dretrowrapper.enableFMLPatch=true"); - version = version.setMinecraftArguments(minecraftArguments + " --tweakClass com.zero.retrowrapper.RetroTweaker"); } } From 66c72ba2bc524da4e91d56f4ba85590c24d1fe48 Mon Sep 17 00:00:00 2001 From: Zkitefly <64117916+zkitefly@users.noreply.github.com> Date: Sat, 26 Apr 2025 00:54:48 +0000 Subject: [PATCH 09/11] Update I18N_zh_CN.properties --- HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties index 31e73e9667..f2e1433f42 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties @@ -980,7 +980,7 @@ settings.advanced.custom_commands.hint=自定义命令被调用时将包含如 settings.advanced.dont_check_game_completeness=不检查游戏完整性 settings.advanced.dont_check_jvm_validity=不检查 JVM 与游戏的兼容性 settings.advanced.dont_patch_natives=不尝试自动替换本地库 -settings.advanced.dont_use_retrowrapper=不使用 NeRd 的 RetroWrapper 补丁（该补丁默认仅会在 Minecraft 1.5 及以下版本使用） +settings.advanced.dont_use_retrowrapper=不使用 RetroWrapper 补丁（该补丁默认仅会在 Minecraft 1.5 及以下版本使用） settings.advanced.environment_variables=环境变量 settings.advanced.game_dir.default=默认 (".minecraft/") settings.advanced.game_dir.independent=各版本独立 (存放在 ".minecraft/versions/<版本名>/"，除 assets、libraries 外) From 0c7e99c6833b4f3e63919563b0cf06e41a8f1d69 Mon Sep 17 00:00:00 2001 From: Zkitefly <64117916+zkitefly@users.noreply.github.com> Date: Sat, 26 Apr 2025 00:55:06 +0000 Subject: [PATCH 10/11] Update I18N_zh.properties --- HMCL/src/main/resources/assets/lang/I18N_zh.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HMCL/src/main/resources/assets/lang/I18N_zh.properties b/HMCL/src/main/resources/assets/lang/I18N_zh.properties index b031032a92..8c62d1532b 100644 --- a/HMCL/src/main/resources/assets/lang/I18N_zh.properties +++ b/HMCL/src/main/resources/assets/lang/I18N_zh.properties @@ -969,7 +969,7 @@ settings.advanced.custom_commands.hint=自訂指令被呼叫時將包含如下 settings.advanced.dont_check_game_completeness=不檢查遊戲完整性 settings.advanced.dont_check_jvm_validity=不檢查 JVM 與遊戲的相容性 settings.advanced.dont_patch_natives=不嘗試自動取代本機庫 -settings.advanced.dont_use_retrowrapper=不使用 NeRd 的 RetroWrapper 修補程式（該修補程式默認僅會在 Minecraft 1.5 及以下版本使用） +settings.advanced.dont_use_retrowrapper=不使用 RetroWrapper 修補程式（該修補程式默認僅會在 Minecraft 1.5 及以下版本使用） settings.advanced.environment_variables=環境變數 settings.advanced.game_dir.default=預設 (".minecraft/") settings.advanced.game_dir.independent=各實例獨立 (".minecraft/versions/<實例名>/"，除 assets、libraries 外) From 65b9c5a8e5ca4b888d99b93d3ce6f21a963c960d Mon Sep 17 00:00:00 2001 From: Zkitefly <64117916+zkitefly@users.noreply.github.com> Date: Sat, 26 Apr 2025 00:55:22 +0000 Subject: [PATCH 11/11] Update I18N.properties --- HMCL/src/main/resources/assets/lang/I18N.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HMCL/src/main/resources/assets/lang/I18N.properties b/HMCL/src/main/resources/assets/lang/I18N.properties index b187376e18..5f7f259ec7 100644 --- a/HMCL/src/main/resources/assets/lang/I18N.properties +++ b/HMCL/src/main/resources/assets/lang/I18N.properties @@ -1168,7 +1168,7 @@ settings.advanced.custom_commands.hint=The following environment variables are p settings.advanced.dont_check_game_completeness=Do not check game integrity settings.advanced.dont_check_jvm_validity=Do not check Java VM compatibility settings.advanced.dont_patch_natives=Do not attempt to automatically replace native libraries -settings.advanced.dont_use_retrowrapper=Do not use NeRd's RetroWrapper for Minecraft 1.5 and earlier (Minecraft 1.6 and later will not use it anyway) +settings.advanced.dont_use_retrowrapper=Do not use RetroWrapper for Minecraft 1.5 and earlier (Minecraft 1.6 and later will not use it anyway) settings.advanced.environment_variables=Environment Variables settings.advanced.game_dir.default=Default (".minecraft/") settings.advanced.game_dir.independent=Isolated (".minecraft/versions//", except for assets and libraries)