Merge branch 'main' into quilt

Plain Craft Launcher 2/Application.xaml.vb

@@ -103,6 +103,7 @@ Public Class Application
  Log($"[Start] 识别码：{UniqueAddress}{If(ThemeCheckOne(9), "，已解锁反馈主题", "")}")
  Log($"[Start] 程序路径：{PathWithName}")
  Log($"[Start] 系统编码：{Encoding.Default} ({Encoding.Default.CodePage}, GBK={IsGBKEncoding})")
+ Log($"[Start] 管理员权限：{IsAdmin()}")
  '检测压缩包运行
  If Path.Contains(IO.Path.GetTempPath()) OrElse Path.Contains("AppData\Local\Temp\") Then
  MyMsgBox("PCL 正在临时文件夹运行，设置、游戏存档等很可能无法保存，且部分功能会无法使用或出错。" & vbCrLf & "请将 PCL 从压缩文件中解压，或是更换文件夹后再继续使用！", "环境警告", "我知道了", IsWarn:=True)

Plain Craft Launcher 2/FormMain.xaml.vb

@@ -10,6 +10,15 @@ Public Class FormMain
  Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
  '统计更新日志条目
 #If BETA Then
+ If LastVersion < 332 Then 'Release 2.8.3
+ If LastVersion = 330 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复部分玩家无法启动 MC 的 Bug"))
+ End If
+ If LastVersion < 330 Then 'Release 2.8.2
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "NeoForge 兼容与自动安装"))
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持编译、运行 PCL 开源代码"))
+ FeatureCount += 15
+ BugCount += 22
+ End If
  If LastVersion < 326 Then 'Release 2.7.4
  FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "会自动隐藏明显不可用的自动安装选项"))
  FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化正版登录流程和 MC 性能"))
@@ -115,6 +124,17 @@ Public Class FormMain
  '3：BUG+ IMP* FEAT-
  '2：BUG* IMP-
  '1：BUG-
+ If LastVersion < 331 Then 'Snapshot 2.8.3
+ If LastVersion = 329 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复部分玩家无法启动 MC 的 Bug"))
+ End If
+ If LastVersion < 329 Then 'Snapshot 2.8.2
+ If LastVersion >= 327 Then
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法安装 Beta 版 NeoForge 的整合包的 Bug"))
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复自动安装无法选择部分 OptiFine 的 Bug"))
+ End If
+ FeatureCount += 4
+ BugCount += 8
+ End If
  If LastVersion < 328 Then 'Snapshot 2.8.1
  If LastVersion = 327 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法安装 Forge 1.12.2- 的 Bug"))
  If LastVersion = 327 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法输入解锁码的 Bug"))

Plain Craft Launcher 2/Modules/Base/ModBase.vb

@@ -11,12 +11,12 @@ Public Module ModBase
 #Region "声明"
 
  '下列版本信息由更新器自动修改
- Public Const VersionBaseName As String = "2.8.1" '不含分支前缀的显示用版本名
- Public Const VersionStandardCode As String = "2.8.1." & VersionBranchCode '标准格式的四段式版本号
+ Public Const VersionBaseName As String = "2.8.3" '不含分支前缀的显示用版本名
+ Public Const VersionStandardCode As String = "2.8.3." & VersionBranchCode '标准格式的四段式版本号
 #If BETA Then
- Public Const VersionCode As Integer = 326 'Release
+ Public Const VersionCode As Integer = 332 'Release
 #Else
- Public Const VersionCode As Integer = 328 'Snapshot
+ Public Const VersionCode As Integer = 331 'Snapshot
 #End If
  '自动生成的版本信息
  Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName
@@ -86,7 +86,7 @@ Public Module ModBase
  ''' <summary>
  ''' 系统盘盘符，以 \ 结尾。例如 “C:\”。
  ''' </summary>
- Public OsDrive As String = Environment.GetLogicalDrives().First.ToUpper.First & ":\"
+ Public OsDrive As String = Environment.GetLogicalDrives().Where(Function(p) Directory.Exists(p)).First.ToUpper.First & ":\" '#3799
  ''' <summary>
  ''' 程序的缓存文件夹路径，以 \ 结尾。
  ''' </summary>
@@ -1016,7 +1016,7 @@ Public Module ModBase
  ''' </summary>
  Public Function CheckPermission(Path As String) As Boolean
  Try
- If Path = "" Then Return False
+ If String.IsNullOrEmpty(Path) Then Return False
  If Not Path.EndsWithF("\") Then Path += "\"
  If Path.EndsWithF(":\System Volume Information\") OrElse Path.EndsWithF(":\$RECYCLE.BIN\") Then Return False
  If Not Directory.Exists(Path) Then Return False
@@ -1257,12 +1257,19 @@ Re:
  Dim DeletedCount As Integer = 0
  Dim Temp As String()
  Temp = Directory.GetFiles(Path)
- For Each str As String In Temp
+ For Each FilePath As String In Temp
+ Dim RetriedFile As Boolean = False
+RetryFile:
  Try
- File.Delete(str)
+ File.Delete(FilePath)
  DeletedCount += 1
  Catch ex As Exception
- If IgnoreIssue Then
+ If Not RetriedFile Then
+ RetriedFile = True
+ Log(ex, $"删除文件失败，将在 0.3s 后重试（{FilePath}）")
+ Thread.Sleep(300)
+ GoTo RetryFile
+ ElseIf IgnoreIssue Then
  Log(ex, "删除单个文件可忽略地失败")
  Else
  Throw
@@ -1273,10 +1280,17 @@ Re:
  For Each str As String In Temp
  DeleteDirectory(str, IgnoreIssue)
  Next
+ Dim RetriedDir As Boolean = False
+RetryDir:
  Try
  Directory.Delete(Path, True)
  Catch ex As Exception
- If IgnoreIssue Then
+ If Not RetriedDir Then
+ RetriedDir = True
+ Log(ex, $"删除文件夹失败，将在 0.3s 后重试（{Path}）")
+ Thread.Sleep(300)
+ GoTo RetryDir
+ ElseIf IgnoreIssue Then
  Log(ex, "删除单个文件夹可忽略地失败")
  Else
  Throw
@@ -1652,7 +1666,10 @@ Re:
  ''' 为字符串进行 XML 转义。
  ''' </summary>
  Public Function EscapeXML(Str As String) As String
- Return Str.Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;").Replace("'", "&apos;").Replace("""", "&quot;").Replace(vbCrLf, "&#xa;")
+ If Str.StartsWithF("{") Then Str = "{}" & Str '#4187
+ Return Str.
+ Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;").Replace("'", "&apos;").
+ Replace("""", "&quot;").Replace(vbCrLf, "&#xa;")
  End Function
 
  '正则

Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb

@@ -629,19 +629,19 @@ NoSubtitle:
  If Id = Project.Id Then Return True '相同实例
  '提取字符串中的字母和数字
  Dim GetRaw =
-  Function(Data As String) As String
-  Dim Result As New StringBuilder()
-  For Each r As Char In Data.Where(Function(c) Char.IsLetterOrDigit(c))
-  Result.Append(r)
-  Next
-  Return Result.ToString.ToLower
-  End Function
+ Function(Data As String) As String
+ Dim Result As New StringBuilder()
+ For Each r As Char In Data.Where(Function(c) Char.IsLetterOrDigit(c))
+ Result.Append(r)
+ Next
+ Return Result.ToString.ToLower
+ End Function
  '来自不同的网站
  If FromCurseForge = Project.FromCurseForge Then Return False
  'Mod 加载器一致
- If ModLoaders.Count <> Project.ModLoaders.Count OrElse ModLoaders.Except(Project.ModLoaders).Count > 0 Then Return False
+ If ModLoaders.Count <> Project.ModLoaders.Count OrElse ModLoaders.Except(Project.ModLoaders).Any() Then Return False
  'MC 版本一致
- If GameVersions.Count <> Project.GameVersions.Count OrElse GameVersions.Except(Project.GameVersions).Count > 0 Then Return False
+ If GameVersions.Count <> Project.GameVersions.Count OrElse GameVersions.Except(Project.GameVersions).Any() Then Return False
  'MCMOD 翻译名 / 原名 / 描述文本 / Slug 的英文部分相同
  If TranslatedName = Project.TranslatedName OrElse
  RawName = Project.RawName OrElse Description = Project.Description OrElse

Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb

@@ -8,9 +8,13 @@
  ''' </summary>
  Public Function DlClientJarGet(Version As McVersion, ReturnNothingOnFileUseable As Boolean) As NetFile
  '获取底层继承版本
- Do While Not String.IsNullOrEmpty(Version.InheritVersion)
- Version = New McVersion(Version.InheritVersion)
- Loop
+ Try
+ Do While Not String.IsNullOrEmpty(Version.InheritVersion)
+ Version = New McVersion(Version.InheritVersion)
+ Loop
+ Catch ex As Exception
+ Log(ex, "获取底层继承版本失败")
+ End Try
  '检查 Json 是否标准
  If Version.JsonObject("downloads") Is Nothing OrElse Version.JsonObject("downloads")("client") Is Nothing OrElse Version.JsonObject("downloads")("client")("url") Is Nothing Then
  Throw New Exception("底层版本 " & Version.Name & " 中无 Jar 文件下载信息")
@@ -610,7 +614,9 @@
  Public Sub DlForgeVersionOfficialMain(Loader As LoaderTask(Of String, List(Of DlForgeVersionEntry)))
  Dim Result As String
  Try
- Result = NetGetCodeByDownload("https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_" & Loader.Input & ".html", UseBrowserUserAgent:=True)
+ Result = NetGetCodeByDownload("https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_" &
+ Loader.Input.Replace("-", "_") & '兼容 Forge 1.7.10-pre4，#4057
+ ".html", UseBrowserUserAgent:=True)
  Catch ex As Exception
  If GetExceptionSummary(ex).Contains("(404)") Then
  Throw New Exception("没有可用版本")
@@ -679,7 +685,9 @@
  ''' Forge 版本列表，BMCLAPI。
  ''' </summary>
  Public Sub DlForgeVersionBmclapiMain(Loader As LoaderTask(Of String, List(Of DlForgeVersionEntry)))
- Dim Json As JArray = NetGetCodeByRequestRetry("https://bmclapi2.bangbang93.com/forge/minecraft/" & Loader.Input, IsJson:=True)
+ Dim Json As JArray = NetGetCodeByRequestRetry("https://bmclapi2.bangbang93.com/forge/minecraft/" &
+ Loader.Input.Replace("-", "_"), '兼容 Forge 1.7.10-pre4，#4057
+ IsJson:=True)
  Dim Versions As New List(Of DlForgeVersionEntry)
  Try
  Dim Recommended As String = McDownloadForgeRecommendedGet(Loader.Input)

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

@@ -1276,25 +1276,40 @@ SystemBrowser:
  ''' 释放 Java Wrapper 并返回完整文件路径。
  ''' </summary>
  Public Function ExtractJavaWrapper() As String
- Dim WrapperPath As String = GetJavaWrapperDir() & "\JavaWrapper.jar"
+ Dim BaseDir As String = GetJavaWrapperDir()
+ Dim WrapperPath As String = BaseDir & "\JavaWrapper.jar"
+ Log("[Java] 选定的 Java Wrapper 路径：" & WrapperPath)
  SyncLock ExtractJavaWrapperLock '避免 OptiFine 和 Forge 安装时同时释放 Java Wrapper 导致冲突
- WriteFile(WrapperPath, GetResources("JavaWrapper"))
+ Dim IsWrapperWritten As Boolean = WriteFile(WrapperPath, GetResources("JavaWrapper"))
+ If Not IsWrapperWritten AndAlso File.Exists(WrapperPath) Then
+ '以下为 #4243 的修复，因为未知原因 Java Wrapper 可能变为只读文件
+ Log("[Java] Java Wrapper 文件释放失败，但文件已存在，将在删除后尝试重新生成", LogLevel.Debug)
+ Try
+ File.Delete(WrapperPath)
+ IsWrapperWritten = WriteFile(WrapperPath, GetResources("JavaWrapper"))
+ Catch ex As Exception
+ Log(ex, "Java Wrapper 文件重新释放失败，将尝试更换文件名重新生成")
+ WrapperPath = BaseDir & "\JavaWrapper2.jar"
+ IsWrapperWritten = WriteFile(WrapperPath, GetResources("JavaWrapper"))
+ End Try
+ End If
+ If Not IsWrapperWritten Then Throw New FileNotFoundException("释放 Java Wrapper 失败，请查看 PCL 日志查找详细信息")
  End SyncLock
- Log("[Java] 已释放 Java Wrapper：" & WrapperPath)
  Return WrapperPath
  End Function
  Private ExtractJavaWrapperLock As New Object
+
  ''' <summary>
  ''' 获取 Java Wrapper 所在的文件夹，不以 \ 结尾。
  ''' </summary>
  Public Function GetJavaWrapperDir() As String
- If PathAppdata.IsASCII() Then
+ If (Path & "PCL").IsASCII() Then
+ Return Path & "PCL"
+ ElseIf PathAppdata.IsASCII() Then
  Return PathAppdata.TrimEnd("\")
  ElseIf PathTemp.IsASCII() Then
- Log("[Java] Wrapper：AppData 路径中包含非 ASCII 字符，换用 Temp 目录")
  Return PathTemp.TrimEnd("\")
  Else
- Log("[Java] Wrapper：AppData 路径与 Temp 路径中均包含非 ASCII 字符，换用 ProgramData 目录")
  Return OsDrive & "ProgramData\PCL"
  End If
  End Function

Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb

@@ -25,6 +25,7 @@ Public Module ModModpack
  Archive = New ZipArchive(New FileStream(File, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
  '从根目录判断整合包类型
  If Archive.GetEntry("mcbbs.packmeta") IsNot Nothing Then PackType = 3 : Exit Try 'MCBBS 整合包（优先于 manifest.json 判断）
+ If Archive.GetEntry("mmc-pack.json") IsNot Nothing Then PackType = 2 : Exit Try 'MMC 整合包（优先于 manifest.json 判断，#4194）
  If Archive.GetEntry("modrinth.index.json") IsNot Nothing Then PackType = 4 : Exit Try 'Modrinth 整合包
  If Archive.GetEntry("manifest.json") IsNot Nothing Then
  Dim Json As JObject = GetJson(ReadFile(Archive.GetEntry("manifest.json").Open, Encoding.UTF8))
@@ -35,7 +36,6 @@ Public Module ModModpack
  End If
  End If
  If Archive.GetEntry("modpack.json") IsNot Nothing Then PackType = 1 : Exit Try 'HMCL 整合包
- If Archive.GetEntry("mmc-pack.json") IsNot Nothing Then PackType = 2 : Exit Try 'MMC 整合包
  '从一级目录判断整合包类型
  For Each Entry In Archive.Entries
  Dim FullNames As String() = Entry.FullName.Split("/")
@@ -196,7 +196,7 @@ Retry:
  End If
  Try
  Log("[ModPack] 整合包 Forge 版本：" & Id)
- ForgeVersion = Id.Split("-")(1)
+ ForgeVersion = Id.Replace("forge-", "")
  Exit For
  Catch ex As Exception
  Log(ex, "读取整合包 Forge 版本失败：" & Id)
@@ -205,7 +205,7 @@ Retry:
  'NeoForge 指定
  Try
  Log("[ModPack] 整合包 NeoForge 版本：" & Id)
- NeoForgeVersion = Id.Split("-")(1)
+ NeoForgeVersion = Id.Replace("neoforge-", "")
  Exit For
  Catch ex As Exception
  Log(ex, "读取整合包 NeoForge 版本失败：" & Id)
@@ -214,7 +214,7 @@ Retry:
  'Fabric 指定
  Try
  Log("[ModPack] 整合包 Fabric 版本：" & Id)
- FabricVersion = Id.Split("-")(1)
+ FabricVersion = Id.Replace("fabric-", "")
  Exit For
  Catch ex As Exception
  Log(ex, "读取整合包 Fabric 版本失败：" & Id)

Plain Craft Launcher 2/Modules/ModEvent.vb

@@ -21,26 +21,28 @@
  OpenWebsite(Data(0))
 
  Case "打开文件", "打开帮助"
- RunInThread(Sub()
- Try
- '确认实际路径
- Dim ActualPaths = GetEventAbsoluteUrls(Data(0), Type)
- Dim Location = ActualPaths(0), WorkingDir = ActualPaths(1)
- '执行
- If Type = "打开文件" Then
- Dim Info As New ProcessStartInfo With {
- .Arguments = If(Data.Length >= 2, Data(1), ""),
- .FileName = Location,
- .WorkingDirectory = WorkingDir
- }
- Process.Start(Info)
- Else '打开帮助
- PageOtherHelp.EnterHelpPage(Location)
- End If
- Catch ex As Exception
- Log(ex, "执行打开类自定义事件失败", LogLevel.Msgbox)
- End Try
- End Sub)
+ RunInThread(
+ Sub()
+ Try
+ '确认实际路径
+ Dim ActualPaths = GetEventAbsoluteUrls(Data(0), Type)
+ Dim Location = ActualPaths(0), WorkingDir = ActualPaths(1)
+ Log($"[Control] 打开类自定义事件实际路径：{Location}，工作目录：{WorkingDir}")
+ '执行
+ If Type = "打开文件" Then
+ Dim Info As New ProcessStartInfo With {
+ .Arguments = If(Data.Length >= 2, Data(1), ""),
+ .FileName = Location,
+ .WorkingDirectory = WorkingDir
+ }
+ Process.Start(Info)
+ Else '打开帮助
+ PageOtherHelp.EnterHelpPage(Location)
+ End If
+ Catch ex As Exception
+ Log(ex, "执行打开类自定义事件失败", LogLevel.Msgbox)
+ End Try
+ End Sub)
 
  Case "启动游戏"
  If Data(0) = "\current" Then

Plain Craft Launcher 2/My Project/AssemblyInfo.vb

@@ -51,6 +51,6 @@ Imports System.Runtime.InteropServices
 ' 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 ' 方法是按如下所示使用“*”
 
-<Assembly: AssemblyVersion("2.8.1.0")>
-<Assembly: AssemblyFileVersion("2.8.1.0")>
+<Assembly: AssemblyVersion("2.8.3.0")>
+<Assembly: AssemblyFileVersion("2.8.3.0")>
 <Assembly: NeutralResourcesLanguage("")>