Merge pull request PCL-Community#100 from PCL-Community/auto-install

支持对已有核心进行自动安装修改操作

Author: Pigeon0v0

Plain Craft Launcher 2/FormMain.xaml.vb

@@ -740,6 +740,8 @@ Public Class FormMain
     Private Sub TriggerPageBack()
         If PageCurrent = PageType.Download AndAlso PageCurrentSub = PageSubType.DownloadInstall AndAlso FrmDownloadInstall.IsInSelectPage Then
             FrmDownloadInstall.ExitSelectPage()
+        ElseIf PageCurrent = PageType.VersionSetup AndAlso PageCurrentSub = PageSubType.VersionInstall AndAlso FrmVersionInstall.IsInSelectPage Then
+            FrmVersionInstall.ExitSelectPage()
         Else
             PageBack()
         End If
@@ -1120,6 +1122,7 @@ Public Class FormMain
         VersionModDisabled = 6
         VersionResourcePack = 7
         VersionShader = 8
+        VersionInstall = 9
     End Enum
     ''' <summary>
     ''' 获取次级页面的名称。若并非次级页面则返回空字符串，故可以以此判断是否为次级页面。

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

@@ -205,14 +205,16 @@ Public Class ValidateFolderName
     Public Property UseMinecraftCharCheck As Boolean = True
     Public Property IgnoreCase As Boolean = True
     Private ReadOnly PathIgnore As IEnumerable(Of DirectoryInfo)
+    Private IsIgnoreSameName As Boolean = False
     Public Sub New()
     End Sub
-    Public Sub New(Path As String, Optional UseMinecraftCharCheck As Boolean = True, Optional IgnoreCase As Boolean = True)
+    Public Sub New(Path As String, Optional UseMinecraftCharCheck As Boolean = True, Optional IgnoreCase As Boolean = True, Optional IgnoreSameName As Boolean = False)
         Me.Path = Path
         Me.IgnoreCase = IgnoreCase
         Me.UseMinecraftCharCheck = UseMinecraftCharCheck
         On Error Resume Next
         PathIgnore = New DirectoryInfo(Path).EnumerateDirectories
+        IsIgnoreSameName = IgnoreSameName
     End Sub
     Public Overrides Function Validate(Str As String) As String
         Try
@@ -242,8 +244,10 @@ Public Class ValidateFolderName
                     Arr.Add(Folder.Name)
                 Next
             End If
-            Dim SameNameCheck = New ValidateExceptSame(Arr, "不可与现有文件夹重名！", IgnoreCase).Validate(Str)
-            If Not SameNameCheck = "" Then Return SameNameCheck
+            If Not IsIgnoreSameName Then
+                Dim SameNameCheck = New ValidateExceptSame(Arr, "不可与现有文件夹重名！", IgnoreCase).Validate(Str)
+                If Not SameNameCheck = "" Then Return SameNameCheck
+            End If
             Return ""
         Catch ex As Exception
             Log(ex, "检查文件夹名出错")

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

@@ -735,7 +735,7 @@ Recheck:
                         ElseIf RealJson.Contains("org.quiltmc:quilt-loader") Then
                             State = McVersionState.Quilt
                             Version.HasQuilt = True
-                            Version.QuiltVersion = If(RegexSeek(RealJson, "(?<=(org.quiltmc:quilt-loader:))[0-9\.]+(\+build.[0-9]+)?"), "未知版本").Replace("+build", "")
+                            Version.QuiltVersion = If(RegexSeek(RealJson, "(?<=(org.quiltmc:quilt-loader:))[0-9\.]+(\+build.[0-9]+)?((-beta.)[0-9]([0-9]?))"), "未知版本").Replace("+build", "")
                         ElseIf RealJson.Contains("minecraftforge") AndAlso Not RealJson.Contains("net.neoforge") Then
                             State = McVersionState.Forge
                             Version.HasForge = True

Plain Craft Launcher 2/Modules/ModMain.vb

@@ -448,6 +448,7 @@ EndHint:
     Public FrmVersionShader As PageVersionShader
     Public FrmVersionResourcePack As PageVersionResourcePack
     Public FrmVersionSetup As PageVersionSetup
+    Public FrmVersionInstall As PageVersionInstall
 
     '资源信息分页声明
     Public FrmDownloadCompDetail As PageDownloadCompDetail

Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb

@@ -2180,6 +2180,7 @@ Retry:
         Select Case Loader.State
             Case LoadState.Finished
                 WriteIni(PathMcFolder & "PCL.ini", "VersionCache", "") '清空缓存（合并安装会先生成文件夹，这会在刷新时误判为可以使用缓存）
+                DeleteDirectory(Loader.Input & "PCLInstallBackups\")
                 Hint(Loader.Name & "成功！", HintType.Finish)
             Case LoadState.Failed
                 Hint(Loader.Name & "失败：" & GetExceptionSummary(Loader.Error), HintType.Critical)
@@ -2188,7 +2189,12 @@ Retry:
             Case LoadState.Loading
                 Exit Sub '不重新加载版本列表
         End Select
-        McInstallFailedClearFolder(Loader)
+        If Not Loader.State = LoadState.Finished AndAlso Directory.Exists(Loader.Input & "PCLInstallBackups\") Then '版本修改失败回滚
+            CopyDirectory(Loader.Input & "PCLInstallBackups\", Loader.Input)
+            File.Delete(Loader.Input & ".pclignore")
+        Else
+            McInstallFailedClearFolder(Loader)
+        End If
         LoaderFolderRun(McVersionListLoader, PathMcFolder, LoaderFolderRunType.ForceRun, MaxDepth:=1, ExtraPath:="versions\")
     End Sub
     ''' <summary>
@@ -2211,7 +2217,7 @@ Retry:
             Thread.Sleep(1000) '防止存在尚未完全释放的文件，导致清理失败（例如整合包安装）
             If Loader.State = LoadState.Failed OrElse Loader.State = LoadState.Aborted Then
                 '删除版本文件夹
-                If Directory.Exists(Loader.Input & "saves\") OrElse Directory.Exists(Loader.Input & "versions\") Then
+                If Directory.Exists(Loader.Input & "saves\") OrElse Directory.Exists(Loader.Input & "versions\") OrElse Directory.Exists(Loader.Input & "mods\") OrElse File.Exists(Loader.Input & "server.dat") Then
                     Log("[Download] 由于版本已被独立启动，不清理版本文件夹：" & Loader.Input, LogLevel.Developer)
                 Else
                     Log("[Download] 由于下载失败或取消，清理版本文件夹：" & Loader.Input, LogLevel.Developer)
@@ -2226,11 +2232,11 @@ Retry:
     ''' <summary>
     ''' 进行合并安装。返回是否已经开始安装（例如如果没有安装 Java 则会进行提示并返回 False）
     ''' </summary>
-    Public Function McInstall(Request As McInstallRequest) As Boolean
+    Public Function McInstall(Request As McInstallRequest, Optional IsEdit As Boolean = False) As Boolean
         Try
-            Dim SubLoaders = McInstallLoader(Request)
+            Dim SubLoaders = McInstallLoader(Request, IgnoreDump:=IsEdit)
             If SubLoaders Is Nothing Then Return False
-            Dim Loader As New LoaderCombo(Of String)(Request.TargetVersionName & " 安装", SubLoaders) With {.OnStateChanged = AddressOf McInstallState}
+            Dim Loader As New LoaderCombo(Of String)(Request.TargetVersionName & If(IsEdit, " 修改", " 安装"), SubLoaders) With {.OnStateChanged = AddressOf McInstallState}
 
             '启动
             Loader.Start(Request.TargetVersionFolder)
@@ -2250,7 +2256,7 @@ Retry:
     ''' 获取合并安装加载器列表，并进行前期的缓存清理与 Java 检查工作。
     ''' </summary>
     ''' <exception cref="CancelledException" />
-    Public Function McInstallLoader(Request As McInstallRequest, Optional DontFixLibraries As Boolean = False) As List(Of LoaderBase)
+    Public Function McInstallLoader(Request As McInstallRequest, Optional DontFixLibraries As Boolean = False, Optional IgnoreDump As Boolean = False) As List(Of LoaderBase)
         '获取缓存目录
         Dim PathInstallTemp As String
         If PathTemp.Contains(" ") AndAlso (Request.OptiFineEntry IsNot Nothing OrElse Request.ForgeEntry IsNot Nothing OrElse Request.NeoForgeEntry IsNot Nothing) Then
@@ -2321,7 +2327,7 @@ Retry:
         Log("[Download] 对应的原版版本：" & Request.MinecraftName)
 
         '重复版本检查
-        If File.Exists(OutputFolder & Request.TargetVersionName & ".json") Then
+        If File.Exists(OutputFolder & Request.TargetVersionName & ".json") AndAlso Not IgnoreDump Then
             Hint("版本 " & Request.TargetVersionName & " 已经存在！", HintType.Critical)
             Throw New CancelledException
         End If

Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb

@@ -1596,7 +1596,7 @@ Public Class PageDownloadInstall
     End Sub
     Private Sub BtnSelectStart_Click() Handles BtnSelectStart.Click
         '确认版本隔离
-        If (SelectedForge IsNot Nothing OrElse SelectedNeoForge IsNot Nothing OrElse SelectedFabric IsNot Nothing) AndAlso
+        If (SelectedForge IsNot Nothing OrElse SelectedNeoForge IsNot Nothing OrElse SelectedFabric IsNot Nothing OrElse SelectedQuilt IsNot Nothing) AndAlso
            (Setup.Get("LaunchArgumentIndie") = 0 OrElse Setup.Get("LaunchArgumentIndie") = 2) Then
             If MyMsgBox("你尚未开启版本隔离，这会导致多个 MC 共用同一个 Mod 文件夹。" & vbCrLf &
                         "因此在切换 MC 版本时，MC 会因为读取到与当前版本不符的 Mod 而崩溃。" & vbCrLf &

Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchLeft.xaml.vb

@@ -611,6 +611,10 @@ Finish:
         End If
         '实际的启动
         If BtnLaunch.Text = "启动游戏" Then
+            If File.Exists(McVersionCurrent.Path + ".pclignore") Then
+                Hint("当前版本正在安装，无法启动！", HintType.Critical)
+                Exit Sub
+            End If
             McLaunchStart()
         ElseIf BtnLaunch.Text = "下载游戏" Then
             FrmMain.PageChange(FormMain.PageType.Download, FormMain.PageSubType.DownloadInstall)
@@ -698,6 +702,10 @@ ExitRefresh:
         If McLaunchLoader.State = LoadState.Loading Then Exit Sub
         McVersionCurrent.Load()
         PageVersionLeft.Version = McVersionCurrent
+        If File.Exists(McVersionCurrent.Path + ".pclignore") Then
+            Hint("当前版本正在安装，暂无法进行版本设置！", HintType.Critical)
+            Exit Sub
+        End If
         FrmMain.PageChange(FormMain.PageType.VersionSetup, 0)
     End Sub
     ''' <summary>