Parcourir la source

Merge pull request #6019 from PCL-Community/fix#6000

fix(ModLaunch): 启动脚本乱码
龙腾猫跃 il y a 1 an
Parent
commit
b29977ee2f
1 fichiers modifiés avec 2 ajouts et 2 suppressions
  1. 2 2
      Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb

+ 2 - 2
Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb

@@ -2095,7 +2095,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 &
@@ -2107,7 +2107,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 = "导出启动脚本成功!"