2.12.8.0

Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb

@@ -102,7 +102,7 @@
                 Else
                     LabEmptyTitle.Text = "无可用版本"
                     LabEmptyContent.Text = "未找到任何版本的游戏，请先下载任意版本的游戏。" & vbCrLf & "若有已存在的游戏，请在左边的列表中选择添加文件夹，选择 .minecraft 文件夹将其导入。"
-                    BtnEmptyDownload.Visibility = If(Settings.Get("UiHiddenPageDownload") AndAlso Not PageSetupUI.HiddenForceShow, Visibility.Collapsed, Visibility.Visible)
+                    BtnEmptyDownload.Visibility = If(Settings.Get(Of Boolean)("UiHiddenPageDownload") AndAlso Not PageSetupUI.HiddenForceShow, Visibility.Collapsed, Visibility.Visible)
                 End If
             Else
                 PanBack.Visibility = Visibility.Visible
@@ -110,7 +110,7 @@
             End If
 
         Catch ex As Exception
-            Log(ex, "将版本列表转换显示时失败", NotifyLevel.MsgBoxAndFeedback)
+            Logger.Error(ex, "将版本列表转换显示时失败")
         End Try
     End Sub
     Public Shared Sub McInstanceListContent(sender As MyListItem, e As EventArgs)
@@ -204,13 +204,8 @@
                         If(IsHintIndie, vbCrLf & "由于该版本开启了版本隔离，删除版本时该版本对应的存档、资源包、Mod 等文件也将被一并删除！", ""),
                         "版本删除确认", , "取消",, True)
                 Case 1
-                    IniClearCache(Instance.PathIndie & "options.txt")
-                    IniClearCache(Instance.PathVersion & "PCL\Setup.ini")
-                    If IsShiftPressed Then
-                        DeleteDirectory(Instance.PathVersion)
-                    Else
-                        FileIO.FileSystem.DeleteDirectory(Instance.PathVersion, FileIO.UIOption.AllDialogs, FileIO.RecycleOption.SendToRecycleBin)
-                    End If
+                    Instance.ResetIniCache()
+                    DirectoryUtils.Delete(Instance.PathVersion, Not IsShiftPressed)
                     Hint("版本 " & Instance.Name & " 已删除！", HintType.Green)
                 Case 2
                     Return
@@ -238,14 +233,14 @@
                 LoaderFolderRun(McInstanceListLoader, McFolderSelected, LoaderFolderRunType.ForceRun, MaxDepth:=1, ExtraPath:="versions\")
             End If
         Catch ex As OperationCanceledException
-            Log(ex, "删除版本 " & Instance.Name & " 被主动取消")
+            Logger.Warn(ex, $"删除版本 {Instance.Name} 被主动取消")
         Catch ex As Exception
-            Log(ex, "删除版本 " & Instance.Name & " 失败", NotifyLevel.MsgBox)
+            Logger.Error(ex, $"删除版本 {Instance.Name} 失败", LogBehavior.Alert)
         End Try
     End Sub
 
     Public Sub BtnEmptyDownload_Loaded() Handles BtnEmptyDownload.Loaded
-        Dim NewVisibility = If((Settings.Get("UiHiddenPageDownload") AndAlso Not PageSetupUI.HiddenForceShow) OrElse ShowHidden, Visibility.Collapsed, Visibility.Visible)
+        Dim NewVisibility = If((Settings.Get(Of Boolean)("UiHiddenPageDownload") AndAlso Not PageSetupUI.HiddenForceShow) OrElse ShowHidden, Visibility.Collapsed, Visibility.Visible)
         If BtnEmptyDownload.Visibility <> NewVisibility Then
             BtnEmptyDownload.Visibility = NewVisibility
             PanLoad.TriggerForceResize()