From 56cf544bb803a84f0e8efb675cc4f25433cfb6c9 Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Wed, 2 Apr 2025 18:34:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(ModLaunch):=20=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb index 2c0f3f6..0c8ae8e 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb @@ -2098,7 +2098,7 @@ IgnoreCustomSkin: "echo 游戏已退出。" & vbCrLf & "pause" WriteFile(If(CurrentLaunchOptions.SaveBatch, Path & "PCL\LatestLaunch.bat"), SecretFilter(CmdString, "F"), - Encoding:=If(Encoding.Default.Equals(Encoding.UTF8), Encoding.UTF8, Encoding.GetEncoding("GB18030"))) + Encoding:=If(McLaunchJavaSelected.VersionCode > 8, Encoding.UTF8, Encoding.Default)) If CurrentLaunchOptions.SaveBatch IsNot Nothing Then McLaunchLog("导出启动脚本完成，强制结束启动过程") AbortHint = "导出启动脚本成功！" From 7cc3595e757d507542589801d24925774d86e644 Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Fri, 25 Apr 2025 19:43:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(ModLaunch):=20=E5=90=8C=E6=AD=A5=20#590?= =?UTF-8?q?9=20=E4=B8=AD=E4=BF=AE=E6=94=B9=E7=9A=84=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=9A=84=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb index 0c8ae8e..bf3eb46 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb @@ -2086,7 +2086,7 @@ IgnoreCustomSkin: '输出 bat Try Dim CmdString As String = - $"{If(McLaunchJavaSelected.VersionCode > 8, "chcp 65001>nul" & vbCrLf, "")}" & + $"{If(McLaunchJavaSelected.VersionCode > 8 AndAlso McLaunchJavaSelected.VersionCode < 18, "chcp 65001>nul" & vbCrLf, "")}" & "@echo off" & vbCrLf & $"title 启动 - {McVersionCurrent.Name}" & vbCrLf & "echo 游戏正在启动，请稍候。" & vbCrLf &