From 06d92556b62977cd1a714813996f7a6335d9bea0 Mon Sep 17 00:00:00 2001 From: allMagicNB <116283787+allMagicNB@users.noreply.github.com> Date: Tue, 13 Aug 2024 11:57:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?Fix=20=E5=AF=BC=E5=87=BA=E5=B4=A9=E6=BA=83?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=B8=AD=E7=9A=84=20=E2=80=9C=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E5=B4=A9=E6=BA=83=E5=89=8D=E7=9A=84=E8=BE=93=E5=87=BA?= =?UTF-8?q?.txt=E2=80=9D=20=E5=8F=AF=E8=83=BD=E4=B9=B1=E7=A0=81=20#4482?= 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, 2 insertions(+) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb index ec7b09d..852dc78 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb @@ -2143,6 +2143,8 @@ IgnoreCustomSkin: StartInfo.EnvironmentVariables("Path") = Join(Paths.Distinct.ToList, ";") '设置其他参数 + StartInfo.StandardErrorEncoding = Encoding.UTF8 + StartInfo.StandardOutputEncoding = Encoding.UTF8 StartInfo.WorkingDirectory = McVersionCurrent.PathIndie StartInfo.UseShellExecute = False StartInfo.RedirectStandardOutput = True From 19fe4c03dc3d8dfc0940a103c20af87e38210b27 Mon Sep 17 00:00:00 2001 From: allMagicNB <116283787+allMagicNB@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:00:26 +0800 Subject: [PATCH 2/4] Fix #4482:+ "chcp 65001 > nul" & Encoding:=Encoding.UTF8 --- Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb index 852dc78..60a9fdc 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb @@ -2051,6 +2051,7 @@ IgnoreCustomSkin: '输出 bat Try Dim CmdString As String = + "chcp 65001 > nul" & vbCrLf & "@echo off" & vbCrLf & "title 启动 - " & McVersionCurrent.Name & vbCrLf & "echo 游戏正在启动，请稍候。" & vbCrLf & @@ -2061,8 +2062,7 @@ IgnoreCustomSkin: """" & McLaunchJavaSelected.PathJava & """ " & McLaunchArgument & vbCrLf & "echo 游戏已退出。" & vbCrLf & "pause" - WriteFile(If(McLaunchLoader.Input.SaveBatch, Path & "PCL\LatestLaunch.bat"), SecretFilter(CmdString, "F"), - Encoding:=If(Encoding.Default.Equals(Encoding.UTF8), Encoding.UTF8, Encoding.GetEncoding("GB18030"))) + WriteFile(If(McLaunchLoader.Input.SaveBatch, Path & "PCL\LatestLaunch.bat"), SecretFilter(CmdString, "F"), Encoding:=Encoding.UTF8) If McLaunchLoader.Input.SaveBatch IsNot Nothing Then McLaunchLog("导出启动脚本完成，强制结束启动过程") AbortHint = "导出启动脚本成功！" From 348472b3ca7e301381d9eef5b81b934ca03346b5 Mon Sep 17 00:00:00 2001 From: allMagicNB <116283787+allMagicNB@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:33:15 +0800 Subject: [PATCH 3/4] Revert --- Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb index 60a9fdc..852dc78 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb @@ -2051,7 +2051,6 @@ IgnoreCustomSkin: '输出 bat Try Dim CmdString As String = - "chcp 65001 > nul" & vbCrLf & "@echo off" & vbCrLf & "title 启动 - " & McVersionCurrent.Name & vbCrLf & "echo 游戏正在启动，请稍候。" & vbCrLf & @@ -2062,7 +2061,8 @@ IgnoreCustomSkin: """" & McLaunchJavaSelected.PathJava & """ " & McLaunchArgument & vbCrLf & "echo 游戏已退出。" & vbCrLf & "pause" - WriteFile(If(McLaunchLoader.Input.SaveBatch, Path & "PCL\LatestLaunch.bat"), SecretFilter(CmdString, "F"), Encoding:=Encoding.UTF8) + WriteFile(If(McLaunchLoader.Input.SaveBatch, Path & "PCL\LatestLaunch.bat"), SecretFilter(CmdString, "F"), + Encoding:=If(Encoding.Default.Equals(Encoding.UTF8), Encoding.UTF8, Encoding.GetEncoding("GB18030"))) If McLaunchLoader.Input.SaveBatch IsNot Nothing Then McLaunchLog("导出启动脚本完成，强制结束启动过程") AbortHint = "导出启动脚本成功！" From b11c8c5d96d15819f37a75097eea815d6e8d0728 Mon Sep 17 00:00:00 2001 From: LxHTT Date: Tue, 13 Aug 2024 21:30:47 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=B8=8B=E8=BD=BD=20NeoForge=20?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=BB=8E=E6=9C=AA=E4=BD=BF=E7=94=A8=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb index 9fc817e..23d6f4a 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb @@ -838,7 +838,7 @@ Public Module ModDownload ''' ''' NeoForge 版本列表，BMCLAPI。 ''' - Public DlNeoForgeListBmclapiLoader As New LoaderTask(Of Integer, DlNeoForgeListResult)("DlNeoForgeList Bmclapi", AddressOf DlNeoForgeListOfficialMain) + Public DlNeoForgeListBmclapiLoader As New LoaderTask(Of Integer, DlNeoForgeListResult)("DlNeoForgeList Bmclapi", AddressOf DlNeoForgeVersionBmclapiMain) Public Sub DlNeoForgeVersionBmclapiMain(Loader As LoaderTask(Of Integer, DlNeoForgeListResult)) '获取版本列表 JSON Dim ResultLatest As String = NetGetCodeByDownload("https://bmclapi2.bangbang93.com/neoforge/meta/api/maven/details/releases/net/neoforged/neoforge", UseBrowserUserAgent:=True, IsJson:=True)