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] 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 = "导出启动脚本成功！"