Skip to content

fix(wrapper): 更换老旧的 RetroWrapper 到 LegacyFix #3159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyogiMutsuki merged 8 commits into from
Jun 18, 2026
Merged

fix(wrapper): 更换老旧的 RetroWrapper 到 LegacyFix #3159

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9960a5a
Uplode
zkitefly Jun 16, 2026
932c3c0
fix
zkitefly Jun 16, 2026
b8d41d3
Update ModLaunch.cs
zkitefly Jun 16, 2026
636400f
fix
zkitefly Jun 16, 2026
11ecdf3
refactor(ModLaunch): simplify legacy fix check logic
zkitefly Jun 16, 2026
b677e7e
Merge remote-tracking branch 'upstream/dev' into betacraftuk/legacyfi…
zkitefly Jun 18, 2026
900725a
Update ModLaunch.cs
zkitefly Jun 18, 2026
dceb6ae
Update metadata.json
zkitefly Jun 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions PCL.Core/App/Config.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,9 +515,9 @@ partial class HideConfigGroup
[ConfigItem<bool>("LaunchAdvanceDisableJLW", true, ConfigSource.Local)] public partial bool DisableJlw { get; set; }

/// <summary>
/// 禁用 Retro Wrapper
/// 禁用 LegacyFix
/// </summary>
[ConfigItem<bool>("LaunchAdvanceDisableRW", false, ConfigSource.Local)] public partial bool DisableRw { get; set; }
[ConfigItem<bool>("LaunchAdvanceDisableLF", false, ConfigSource.Local)] public partial bool DisableLF { get; set; }

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 16, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Complete the DisableRw rename

This rename removes the generated DisableRw members, but PageSetupLaunch.xaml.cs and PageInstanceSetup.xaml.cs still reference Config.Launch.DisableRw / Config.Instance.DisableRw and CheckAdvanceDisableRW. After source generation and XAML name generation, those symbols no longer exist, so the project will not compile until the remaining code-behind references are updated to the new DisableLF/CheckAdvanceDisableLF names.

Useful? React with 👍 / 👎.

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 16, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Preserve existing wrapper opt-outs

When upgrading a profile where LaunchAdvanceDisableRW is already true, this renamed ConfigItem reads the new LaunchAdvanceDisableLF key with the default false instead, and the old key is no longer referenced anywhere. That silently re-enables legacy-wrapper injection for users who explicitly disabled it for old-version launches; please migrate or alias the old global/per-instance keys before defaulting the new LegacyFix setting to enabled.

Useful? React with 👍 / 👎.


/// <summary>
/// 强制使用高性能显卡。
Comment thread
sourcery-ai[bot] marked this conversation as resolved.
Expand Down Expand Up @@ -614,7 +614,7 @@ partial class HideConfigGroup
[ConfigItem<bool>("VersionAdvanceDisableJLW", false)] public partial ArgConfig<bool> DisableJlw { get; }
[ConfigItem<bool>("VersionAdvanceDisableLwjglUnsafeAgent", false)] public partial ArgConfig<bool> DisableLwjglUnsafeAgent { get; }
[ConfigItem<bool>("VersionAdvanceUseProxyV2", false)] public partial ArgConfig<bool> UseProxy { get; }
[ConfigItem<bool>("VersionAdvanceDisableRW", false)] public partial ArgConfig<bool> DisableRw { get; }
[ConfigItem<bool>("VersionAdvanceDisableLF", false)] public partial ArgConfig<bool> DisableLF { get; }
[ConfigItem<bool>("VersionUseDebugLog4j2Config", false)] public partial ArgConfig<bool> UseDebugLof4j2Config { get; }
[ConfigItem<int>("VersionRamType", 2)] public partial ArgConfig<int> MemorySolution { get; }
[ConfigItem<int>("VersionRamCustom", 15)] public partial ArgConfig<int> CustomMemorySize { get; }
Expand Down
4 changes: 2 additions & 2 deletions PCL.Core/App/Localization/Languages/en-US.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1655,8 +1655,8 @@
<sys:String x:Key="Setup.Launch.Advanced.DisableJlw">Disable Java Launch Wrapper</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.DisableJlw.ToolTip">PCL uses Java Launch Wrapper to fix issues where older Java versions cannot launch from paths containing Chinese characters.&#x0a;If it is blocked by anti-cheat or causes other issues, you can disable it.</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.DisableJlw.Arm64Notice">Do not wrap with Java Wrapper when launching the game.&#x0a;Java Wrapper has been forcibly disabled because the system is ARM64 architecture.</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.DisableRw">Disable RetroWrapper</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.DisableRw.ToolTip">PCL uses RetroWrapper when launching version 1.5.x and below to improve legacy version gameplay experience and fix compatibility issues.</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.DisableLF">Disable LegacyFix</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.DisableLF.ToolTip">PCL uses LegacyFix when launching version 1.5.x and below to improve legacy version gameplay experience and fix compatibility issues.</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.GpuPreference">Require Java to use the high-performance GPU</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.GpuPreference.ToolTip">Automatically set Java to use the high-performance GPU in Windows Settings → System → Display → Graphics.&#x0a;If the computer has both integrated and dedicated graphics, this ensures that Minecraft uses the dedicated GPU for rendering, greatly improving performance.</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.UseJavaExe">Use java.exe instead of javaw.exe</sys:String>
Expand Down
4 changes: 2 additions & 2 deletions PCL.Core/App/Localization/Languages/zh-CN.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1655,8 +1655,8 @@
<sys:String x:Key="Setup.Launch.Advanced.DisableJlw">禁用 Java Launch Wrapper</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.DisableJlw.ToolTip">PCL 会使用 Java Launch Wrapper 来修复老版本 Java 在中文路径下无法启动的问题。&#x0a;如果这被反作弊拦截，或遇到其他问题，也可以将其关闭。</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.DisableJlw.Arm64Notice">在启动游戏时不使用 Java Wrapper 进行包装。&#x0a;由于系统为 ARM64 架构，Java Wrapper 已被强制禁用。</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.DisableRw">禁用 RetroWrapper</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.DisableRw.ToolTip">PCL 会在启动 1.5.x 及以下版本时使用 RetroWrapper 来改善老版本游戏体验和修复兼容性问题。</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.DisableLF">禁用 LegacyFix</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.DisableLF.ToolTip">PCL 会在启动 1.5.x 及以下版本时使用 LegacyFix 来改善老版本游戏体验和修复兼容性问题。</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.GpuPreference">要求 Java 使用高性能显卡</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.GpuPreference.ToolTip">自动在 Windows 设置 → 系统 → 屏幕 → 显示卡 中将 Java 改为使用高性能显卡。&#x0a;如果电脑同时有集显和独显，这能确保 MC 使用独显进行渲染，以大幅提高性能。</sys:String>
<sys:String x:Key="Setup.Launch.Advanced.UseJavaExe">使用 java.exe 而不是 javaw.exe</sys:String>
Expand Down
50 changes: 30 additions & 20 deletions Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2239,15 +2239,20 @@ private static void WriteLinkD(string path)
}

/// <summary>
/// 判断是否使用 RetroWrapper。
/// TODO: 在更换为 Drop 比较版本号后可能不准确，需要测试确认。
/// 判断是否使用 LegacyFix。
/// </summary>
private static bool McLaunchNeedsRetroWrapper(McInstance mc)
private static bool McLaunchNeedsLegacyFix(McInstance mc)
{
return (mc.releaseTime >= new DateTime(2013, 6, 25) && mc.Info.Drop == 99) ||
(mc.Info.Drop < 60 && mc.Info.Drop != 99 &&
!Config.Launch.DisableRw &&
!Config.Instance.DisableRw[mc.PathInstance]); // <1.6
if (Config.Launch.DisableLF || Config.Instance.DisableLF[mc.PathInstance])
{
ModBase.Log("[Launch] LegacyFix 已被禁用");
return false;
}
if (mc.releaseTime < new DateTime(2013, 6, 25) && mc.releaseTime.Year > 2000)

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 18, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Preserve version fallback before skipping LegacyFix

For inherited/modded old profiles that omit releaseTime, McInstance leaves releaseTime at 1970 while still deriving the vanilla version from inheritsFrom (McInstance.cs lines 162-163 and 231-236). This date-only gate therefore returns false for recognized 1.5.2 Forge/LiteLoader-style instances, so LegacyFix is neither extracted nor injected even though the old Info.Drop < 60 check covered them; keep a version/Drop-based path for recognized legacy versions instead of relying solely on releaseTime.

Useful? React with 👍 / 👎.

{
return true;
}
return false;
}

/// <summary>
Expand Down Expand Up @@ -2616,10 +2621,19 @@ private static string McLaunchArgumentsJvmNew(McInstance instance)
ModBase.Log(ex, Lang.Text("Minecraft.Launch.Error.Proxy"), ModBase.LogLevel.Hint);
}

// 添加 RetroWrapper 相关参数
if (McLaunchNeedsRetroWrapper(instance))
// https://github.com/NeRdTheNed/RetroWrapper/wiki/RetroWrapper-flags
dataList.Add("-Dretrowrapper.doUpdateCheck=false");
// 添加 LegacyFix 相关参数
if (McLaunchNeedsLegacyFix(instance))
{
var legacyFixPath = Path.Combine(ModBase.pathPure, "legacyfix.jar");
dataList.Add("-javaagent:\"" + legacyFixPath + "\"");

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 16, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Add the LegacyFix agent to the old JVM path

This -javaagent is only added in McLaunchArgumentsJvmNew(), but the 1.5.x-and-below versions this feature targets are routed through McLaunchArgumentsJvmOld() when their JSON only has minecraftArguments. The later classpath copy only places legacyfix.jar on -cp; it does not invoke the JAR's Premain-Class, so those legacy versions launch without any LegacyFix patches.

Useful? React with 👍 / 👎.

@chatgpt-codex-connector chatgpt-codex-connector Bot Jun 16, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Route LegacyFix through a recognized launcher

When a legacy instance reaches this new-JVM-args path with Java Wrapper enabled (the block immediately below, on UTF-8 code pages) or with a normal Minecraft main class, the JVM command seen by the bundled LegacyFixAgent is not one of the launchers its required launcher patch accepts (LegacyFixLauncher, Prism/MultiMC, or LaunchWrapper). The agent exits on unknown launchers during premain, so adding it as a bare -javaagent can abort these launches before Minecraft starts; this path needs to invoke/identify LegacyFix’s launcher instead of only attaching the agent.

Useful? React with 👍 / 👎.


// Beta 1.6 以前版本需要添加的参数
if (instance.releaseTime < new DateTime(2011, 5, 25))
{
dataList.Add("-Djava.util.Arrays.useLegacyMergeSort=true");
}
}

// 添加 Java Wrapper 作为主 Jar
if (ModBase.IsUtf8CodePage() && !Config.Launch.DisableJlw &&
!Config.Instance.DisableJlw[ModInstanceList.McMcInstanceSelected?.PathInstance])
Expand Down Expand Up @@ -2668,9 +2682,6 @@ private static string McLaunchArgumentsGameOld(McInstance version)
{
var dataList = new List<string>();

// 添加 RetroWrapper 相关参数
if (McLaunchNeedsRetroWrapper(version)) dataList.Add("--tweakClass com.zero.retrowrapper.RetroTweaker");

// 本地化 Minecraft 启动信息
var basicString = version.JsonObject["minecraftArguments"].ToString();
if (!basicString.Contains("--height"))
Expand Down Expand Up @@ -2887,18 +2898,17 @@ private static Dictionary<string, string> McLaunchArgumentsReplace(McInstance in
var cpStrings = new List<string>();
string optiFineCp = null;

// RetroWrapper 释放
if (McLaunchNeedsRetroWrapper(instance))
// LegacyFix 释放
if (McLaunchNeedsLegacyFix(instance))
{
var wrapperPath = ModFolder.mcFolderSelected + @"libraries\retrowrapper\RetroWrapper.jar";
var legacyFixPath = Path.Combine(ModBase.pathPure, "legacyfix.jar");
try
{
ModBase.WriteFile(wrapperPath, ModBase.GetResourceStream("Resources/retro-wrapper.jar"));
cpStrings.Add(wrapperPath);
ModBase.WriteFile(legacyFixPath, ModBase.GetResourceStream("Resources/legacyfix.jar"));
}
catch (Exception ex)
{
ModBase.Log(ex, "RetroWrapper 释放失败");
ModBase.Log(ex, "LegacyFix 释放失败");
}
}

Expand Down
8 changes: 4 additions & 4 deletions Plain Craft Launcher 2/Pages/PageInstance/PageInstanceSetup.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,11 +383,11 @@
ToolTipService.Placement="Right"
ToolTip="{DynamicResource Setup.Launch.Advanced.DisableJlw.ToolTip}" />
<local:MyCheckBox Height="28"
Text="{DynamicResource Setup.Launch.Advanced.DisableRw}"
x:Name="CheckAdvanceDisableRW"
Tag="VersionAdvanceDisableRW"
Text="{DynamicResource Setup.Launch.Advanced.DisableLF}"
x:Name="CheckAdvanceDisableLF"
Tag="VersionAdvanceDisableLF"
ToolTipService.Placement="Right"
ToolTip="{DynamicResource Setup.Launch.Advanced.DisableRw.ToolTip}" />
ToolTip="{DynamicResource Setup.Launch.Advanced.DisableLF.ToolTip}" />
<local:MyCheckBox Height="28" Text="{DynamicResource Instance.Setup.Advanced.UseDebugLog4j}"
x:Name="CheckUseDebugLog4j2Config"
Tag="VersionUseDebugLog4j2Config"
Expand Down
6 changes: 3 additions & 3 deletions Plain Craft Launcher 2/Pages/PageInstance/PageInstanceSetup.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public PageInstanceSetup()
CheckAdvanceAssetsV2.Change += CheckBoxChange;
CheckAdvanceUseProxyV2.Change += CheckBoxChange;
CheckAdvanceDisableJLW.Change += CheckBoxChange;
CheckAdvanceDisableRW.Change += CheckBoxChange;
CheckAdvanceDisableLF.Change += CheckBoxChange;
CheckUseDebugLog4j2Config.Change += CheckUseDebugLog4j2Config_CheckChanged;
CheckAdvanceDisableLwjglUnsafeAgent.Change += CheckBoxChange;

Expand Down Expand Up @@ -147,7 +147,7 @@ public void Reload()
CheckAdvanceDisableJLW.Checked = Config.Instance.DisableJlw[PageInstanceLeft.McInstance.PathInstance];
}
CheckUseDebugLog4j2Config.Checked = Config.Instance.UseDebugLof4j2Config[PageInstanceLeft.McInstance.PathInstance];
CheckAdvanceDisableRW.Checked = Config.Instance.DisableRw[PageInstanceLeft.McInstance.PathInstance];
CheckAdvanceDisableLF.Checked = Config.Instance.DisableLF[PageInstanceLeft.McInstance.PathInstance];
}

catch (Exception ex)
Expand Down Expand Up @@ -269,7 +269,7 @@ private void CheckBoxChange(object sender, bool user)
"VersionAdvanceAssetsV2" => Config.Instance.DisableAssetVerifyV2,
"VersionAdvanceUseProxyV2" => Config.Instance.UseProxy,
"VersionAdvanceDisableJLW" => Config.Instance.DisableJlw,
"VersionAdvanceDisableRW" => Config.Instance.DisableRw,
"VersionAdvanceDisableLF" => Config.Instance.DisableLF,
"VersionUseDebugLog4j2Config" => Config.Instance.UseDebugLof4j2Config,
"VersionAdvanceDisableLwjglUnsafeAgent" => Config.Instance.DisableLwjglUnsafeAgent,
_ => throw new ArgumentOutOfRangeException()
Expand Down
4 changes: 2 additions & 2 deletions Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@
<StackPanel Margin="0,12,0,4" Grid.Row="8" Grid.ColumnSpan="2" HorizontalAlignment="Left">
<local:MyCheckBox Height="28" Text="{DynamicResource Setup.Launch.Advanced.DisableJlw}" x:Name="CheckAdvanceDisableJLW" Tag="LaunchAdvanceDisableJLW" Change="CheckBoxChange"
ToolTipService.Placement="Right" ToolTip="{DynamicResource Setup.Launch.Advanced.DisableJlw.ToolTip}" />
<local:MyCheckBox Height="28" Text="{DynamicResource Setup.Launch.Advanced.DisableRw}" x:Name="CheckAdvanceDisableRW" Tag="LaunchAdvanceDisableRW" Change="CheckBoxChange"
ToolTipService.Placement="Right" ToolTip="{DynamicResource Setup.Launch.Advanced.DisableRw.ToolTip}" />
<local:MyCheckBox Height="28" Text="{DynamicResource Setup.Launch.Advanced.DisableLF}" x:Name="CheckAdvanceDisableLF" Tag="LaunchAdvanceDisableLF" Change="CheckBoxChange"
ToolTipService.Placement="Right" ToolTip="{DynamicResource Setup.Launch.Advanced.DisableLF.ToolTip}" />
<local:MyCheckBox Height="28" Text="{DynamicResource Setup.Launch.Advanced.GpuPreference}" x:Name="CheckAdvanceGraphicCard" Tag="LaunchAdvanceGraphicCard" Change="CheckBoxChange"
ToolTipService.Placement="Right" ToolTip="{DynamicResource Setup.Launch.Advanced.GpuPreference.ToolTip}" />
<local:MyCheckBox Height="28" Text="{DynamicResource Setup.Launch.Advanced.UseJavaExe}" x:Name="CheckAdvanceNoJavaw" Tag="LaunchAdvanceNoJavaw" Change="CheckBoxChange"
Expand Down
4 changes: 2 additions & 2 deletions Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void Reload()
TextAdvanceGame.Text = Config.Launch.GameArgs;
TextAdvanceRun.Text = Config.Launch.PreLaunchCommand;
CheckAdvanceRunWait.Checked = Config.Launch.PreLaunchCommandWait;
CheckAdvanceDisableRW.Checked = Config.Launch.DisableRw;
CheckAdvanceDisableLF.Checked = Config.Launch.DisableLF;
CheckAdvanceGraphicCard.Checked = Config.Launch.SetGpuPreference;
CheckAdvanceNoJavaw.Checked = Config.Launch.NoJavaw;
CheckAdvanceDisableLwjglUnsafeAgent.Checked = Config.Launch.DisableLwjglUnsafeAgent;
Expand Down Expand Up @@ -187,7 +187,7 @@ private static void SetLaunchByTag(string tag, object value)
case "LaunchAdvanceRun": Config.Launch.PreLaunchCommand = (string)value; break;
case "LaunchAdvanceRunWait": Config.Launch.PreLaunchCommandWait = (bool)value; break;
case "LaunchAdvanceDisableJLW": Config.Launch.DisableJlw = (bool)value; break;
case "LaunchAdvanceDisableRW": Config.Launch.DisableRw = (bool)value; break;
case "LaunchAdvanceDisableLF": Config.Launch.DisableLF = (bool)value; break;
case "LaunchAdvanceGraphicCard": Config.Launch.SetGpuPreference = (bool)value; break;
case "LaunchAdvanceNoJavaw": Config.Launch.NoJavaw = (bool)value; break;
case "LaunchAdvanceDisableLwjglUnsafeAgent": Config.Launch.DisableLwjglUnsafeAgent = (bool)value; break;
Expand Down
Binary file added Plain Craft Launcher 2/Resources/legacyfix.jar
View file
Open in desktop
Binary file not shown.
Binary file removed Plain Craft Launcher 2/Resources/retro-wrapper.jar
View file
Open in desktop
Binary file not shown.
Loading