From d546528904fe1760338bffa4cf838e9df4746a8b Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Sat, 22 Mar 2025 15:21:33 +0000 Subject: [PATCH] =?UTF-8?q?chore(ModDownloadLib):=20=E6=8C=89=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/ModMain.vb | 13 ++++++------- .../Pages/PageDownload/ModDownloadLib.vb | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/ModMain.vb b/Plain Craft Launcher 2/Modules/ModMain.vb index 7702f6c..51cde8e 100644 --- a/Plain Craft Launcher 2/Modules/ModMain.vb +++ b/Plain Craft Launcher 2/Modules/ModMain.vb @@ -873,17 +873,16 @@ NextFile: End Sub ''' - ''' 申请一个可用于任务缓存的临时文件夹。 + ''' 申请一个可用于任务缓存的临时文件夹，以 \ 结尾。 ''' 这些文件夹无需进行后续清理。 ''' ''' 是否要求路径不包含空格。 - ''' 是否要求路径包含斜杠。 - Public Function RequestTaskTempFolder(Optional RequireNonSpace As Boolean = False, Optional RequireSlash As Boolean = True) As String + Public Function RequestTaskTempFolder(Optional RequireNonSpace As Boolean = False) As String TryClearTaskTemp() - Dim RequestTaskTempFolderWithoutSlash As String = If(RequireNonSpace AndAlso $"{PathTemp}TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}".Contains(" "), - $"{OsDrive}ProgramData\PCL\TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}", - $"{PathTemp}TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}") - RequestTaskTempFolder = If(RequireSlash, $"{RequestTaskTempFolderWithoutSlash}\", RequestTaskTempFolderWithoutSlash) + RequestTaskTempFolder = $"{PathTemp}TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}\" + If RequireNonSpace AndAlso RequestTaskTempFolder.Contains(" ") Then + RequestTaskTempFolder = $"{OsDrive}ProgramData\PCL\TaskTemp\{GetUuid()}-{RandomInteger(0, 1000000)}\" + End If Directory.CreateDirectory(RequestTaskTempFolder) End Function diff --git a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb index f2431af..fb323e5 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb @@ -613,7 +613,7 @@ pause" Log("[Download] 检测为新版 OptiFine：" & DownloadInfo.Inherit) Loaders.Add(New LoaderTask(Of List(Of NetFile), Boolean)("安装 OptiFine（方式 A）", Sub(Task As LoaderTask(Of List(Of NetFile), Boolean)) - Dim BaseMcFolderHome As String = RequestTaskTempFolder(False, False) + Dim BaseMcFolderHome As String = BaseMcFolderHome.TrimEnd("\") Dim BaseMcFolder As String = BaseMcFolderHome & "\.minecraft\" Try '准备安装环境