2.13.0.0

Plain Craft Launcher 2/Pages/PageInstance/PageInstanceOverall.xaml.vb

@@ -1,4 +1,4 @@
-Public Class PageInstanceOverall
+Public Class PageInstanceOverall
 
     Private IsLoad As Boolean = False
     Private Sub PageSetupLaunch_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -116,15 +116,15 @@
             Dim JsonObject As JObject
             Dim OldJsonPath As String = PageInstanceLeft.Instance.GetJsonPath()
             Try
-                JsonObject = GetJson(FileUtils.ReadAsString(OldJsonPath))
+                JsonObject = FileUtils.ReadAsJson(OldJsonPath)
             Catch ex As Exception
-                Logger.Warn(ex, "在重命名读取 json 时失败")
+                Logger.Warn(ex, "在重命名读取 JSON 时失败")
                 JsonObject = PageInstanceLeft.Instance.JsonObject
             End Try
             '重命名主文件夹
             DirectoryUtils.Move(OldPath, NewPath)
             '清理 ini 缓存
-            PageInstanceLeft.Instance.ResetIniCache()
+            PageInstanceLeft.Instance.ResetSettingsCache()
             '重命名 jar 文件与 natives 文件夹
             '不能进行遍历重命名，否则在版本名很短的时候容易误伤其他文件（#6443）
             If DirectoryUtils.Exists($"{NewPath}{OldName}-natives") Then DirectoryUtils.Move($"{NewPath}{OldName}-natives", $"{NewPath}{NewName}-natives")
@@ -271,7 +271,7 @@
                 Return
             Next
             '启动
-            Dim Loader As New LoaderCombo(Of String)(PageInstanceLeft.Instance.Name & " 文件补全", DlClientFix(PageInstanceLeft.Instance, True, AssetsIndexExistsBehaviour.AlwaysDownload))
+            Dim Loader As New LoaderCombo(Of String)(PageInstanceLeft.Instance.Name & " 文件补全", DlClientFix(PageInstanceLeft.Instance, True, False))
             Loader.OnStateChanged =
             Sub()
                 Select Case Loader.State
@@ -279,7 +279,7 @@
                         Hint(Loader.Name & "成功！", HintType.Green)
                     Case LoadState.Failed
                         Hint(Loader.Name & "失败：" & Loader.Error.GetDisplay(False), HintType.Red)
-                    Case LoadState.Interrupted
+                    Case LoadState.Canceled
                         Hint(Loader.Name & "已取消！", HintType.Blue)
                 End Select
             End Sub
@@ -302,7 +302,7 @@
                         If(IsHintIndie, vbCrLf & "由于该版本开启了版本隔离，删除版本时该版本对应的存档、资源包、Mod 等文件也将被一并删除！", ""),
                         "版本删除确认", , "取消",, IsHintIndie OrElse IsShiftPressed)
                 Case 1
-                    PageInstanceLeft.Instance.ResetIniCache()
+                    PageInstanceLeft.Instance.ResetSettingsCache()
                     DirectoryUtils.Delete(PageInstanceLeft.Instance.PathVersion, Not IsShiftPressed)
                     Hint("已删除版本 " & PageInstanceLeft.Instance.Name & "！", HintType.Green)
                 Case 2