2.8.10

2024-11-08 00:43:29 +08:00
parent 47585e5c9d
commit 2a46c9f5ce
54 changed files with 1013 additions and 779 deletions
@@ -24,7 +24,7 @@
            <TextBlock Grid.Row="0" FontSize="23" TextTrimming="None" Foreground="{DynamicResource ColorBrush2}" HorizontalAlignment="Left" Name="LabTitle" Margin="7,-1,70,9" Text="测试标题文本" VerticalAlignment="Top" SnapsToDevicePixels="False" UseLayoutRounding="False" />
            <Rectangle x:Name="ShapeLine" Grid.Row="1" Height="2" Fill="{Binding Foreground, ElementName=LabTitle}" />
            <my:MyScrollViewer Grid.Row="3" VerticalAlignment="Top" x:Name="PanCaption" Margin="0,0,0,17" Padding="7,0,15,0"
-                               VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" DeltaMuity="0.7">
+                               VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" DeltaMult="0.7">
                <TextBlock VerticalAlignment="Top" TextTrimming="None" TextWrapping="Wrap" Name="LabCaption" FontSize="15" LineHeight="18"
                           Foreground="#FF5C5C5C" FontWeight="Normal" Padding="1" />
            </my:MyScrollViewer>
@@ -26,21 +26,15 @@
            If File.Exists(Path & "modpack.zip") Then PackInstallPath = Path & "modpack.zip"
            If File.Exists(Path & "modpack.mrpack") Then PackInstallPath = Path & "modpack.mrpack"
            If PackInstallPath IsNot Nothing Then
-                If MyMsgBox($"PCL 即将在当前文件夹下自动安装整合包。", "自动安装", "继续", "取消") = 1 Then
-                    '确认自动安装
-                    Log("[Launch] 需自动安装整合包：" & PackInstallPath, LogLevel.Debug)
-                    Setup.Set("LaunchFolderSelect", "$.minecraft\")
-                    If Not Directory.Exists(Path & ".minecraft\") Then
-                        Directory.CreateDirectory(Path & ".minecraft\")
-                        Directory.CreateDirectory(Path & ".minecraft\versions\")
-                        McFolderLauncherProfilesJsonCreate(Path & ".minecraft\")
-                    End If
-                    McFolderListLoader.WaitForExit(IsForceRestart:=True)
-                Else
-                    '取消自动安装
-                    Log("[Launch] 取消自动安装整合包：" & PackInstallPath, LogLevel.Debug)
-                    PackInstallPath = Nothing
+                Log("[Launch] 需自动安装整合包：" & PackInstallPath, LogLevel.Debug)
+                Setup.Set("LaunchFolderSelect", "$.minecraft\")
+                If Not Directory.Exists(Path & ".minecraft\") Then
+                    Directory.CreateDirectory(Path & ".minecraft\")
+                    Directory.CreateDirectory(Path & ".minecraft\versions\")
+                    McFolderLauncherProfilesJsonCreate(Path & ".minecraft\")
                End If
+                PageSelectLeft.AddFolder(Path & ".minecraft\", GetFolderNameFromPath(Path), False)
+                McFolderListLoader.WaitForExit()
            End If
            '确认 Minecraft 文件夹存在
            PathMcFolder = Setup.Get("LaunchFolderSelect").ToString.Replace("$", Path)
@@ -58,18 +52,19 @@
            If Setup.Get("SystemDebugDelay") Then Thread.Sleep(RandomInteger(500, 3000))
            '自动整合包安装
            If PackInstallPath IsNot Nothing Then
-                Dim InstallLoader = ModpackInstall(PackInstallPath)
-                If InstallLoader Is Nothing Then
-                    Log("[Launch] 自动安装整合包失败：" & PackInstallPath)
-                Else
-                    Log("[Launch] 自动安装整合包开始：" & PackInstallPath)
-                    RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.DownloadManager))
+                Try
+                    Dim InstallLoader = ModpackInstall(PackInstallPath, GetFolderNameFromPath(Path))
+                    Log("[Launch] 自动安装整合包已开始：" & PackInstallPath)
                    InstallLoader.WaitForExit()
                    If InstallLoader.State = LoadState.Finished Then
                        Log("[Launch] 自动安装整合包成功，删除安装包：" & PackInstallPath)
                        File.Delete(PackInstallPath)
                    End If
-                End If
+                Catch ex As CancelledException
+                    Log(ex, "自动安装整合包被用户取消：" & PackInstallPath)
+                Catch ex As Exception
+                    Log(ex, "自动安装整合包失败：" & PackInstallPath, LogLevel.Msgbox)
+                End Try
            End If
            '确认 Minecraft 版本存在
            Dim Selection As String = Setup.Get("LaunchVersionSelect")
@@ -431,7 +426,7 @@ Finish:
                ElseIf Setup.Get("LoginLegacyName") = "" Then
                    Return New EqualableList(Of String) From {0, ""}
                Else
-                    Return New EqualableList(Of String) From {0, If(Setup.Get("LoginLegacyName").ToString.Before("¨"), "")}
+                    Return New EqualableList(Of String) From {0, If(Setup.Get("LoginLegacyName").ToString.BeforeFirst("¨"), "")}
                End If
            Case 3
                Return New EqualableList(Of String) From {3, Setup.Get("LaunchSkinID")}
@@ -22,4 +22,4 @@
            </local:MyCard>
        </StackPanel>
    </local:MyScrollViewer>
-</local:MyPageRight>
+</local:MyPageRight>
@@ -1,4 +1,5 @@
 Public Class PageLaunchRight
+    Implements IRefreshable

    Private Sub Init() Handles Me.Loaded
        PanBack.ScrollToHome()
@@ -26,12 +27,6 @@
    ''' <summary>
    ''' 刷新自定义主页。
    ''' </summary>
-    Private Sub PressF5(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
-        If e.Key = Key.F5 Then
-            ForceRefresh()
-        End If
-    End Sub
-
    Private Sub Refresh() Handles Me.Loaded
        RunInNewThread(
        Sub()
@@ -98,7 +93,7 @@ Download:
                        GoTo Download
                    Case 3
                        Log("[Page] 主页预设：简单主页")
-                        Url = "https://gitee.com/mfn233/PCL-Mainpage/raw/main/Custom.xaml"
+                        Url = "https://raw.gitcode.com/mfn233/PCL-Mainpage/raw/main/Custom.xaml"
                        GoTo Download
                    Case 4
                        Log("[Page] 主页预设：每日整合包推荐")
@@ -122,7 +117,7 @@ Download:
                        GoTo Download
                    Case 9
                        Log("[Page] 主页预设：PCL 新功能说明书")
-                        Url = "https://gitee.com/wforstbreeze/whats-new-pcl/raw/main/Custom.xaml"
+                        Url = "https://raw.gitcode.com/WForst-Breeze/WhatsNewPCL/raw/main/Custom.xaml"
                        GoTo Download
                    Case 10
                        Log("[Page] 主页预设：OpenMCIM Dashboard")
@@ -144,10 +139,10 @@ Download:
            If Address.Contains(".xaml") Then
                VersionAddress = Address.Replace(".xaml", ".xaml.ini")
            Else
-                VersionAddress = Address.Before("?")
+                VersionAddress = Address.BeforeFirst("?")
                If Not VersionAddress.EndsWith("/") Then VersionAddress += "/"
                VersionAddress += "version"
-                If Address.Contains("?") Then VersionAddress += Address.After("?")
+                If Address.Contains("?") Then VersionAddress += Address.AfterLast("?")
            End If
            '校验版本
            Dim Version As String = ""
@@ -189,7 +184,7 @@ Download:
    ''' 立即强制刷新自定义主页。
    ''' 必须在 UI 线程调用。
    ''' </summary>
-    Public Sub ForceRefresh()
+    Public Sub ForceRefresh() Implements IRefreshable.Refresh
        Log("[Page] 要求强制刷新自定义主页")
        ClearCache()
        '实际的刷新
@@ -17,8 +17,8 @@
                ComboName.ItemsSource = Nothing
            Else
                ComboName.ItemsSource = Setup.Get("LoginAuthEmail").ToString.Split("¨")
-                ComboName.Text = Setup.Get("LoginAuthEmail").ToString.Before("¨")
-                If Setup.Get("LoginRemember") Then TextPass.Password = Setup.Get("LoginAuthPass").ToString.Before("¨").Trim
+                ComboName.Text = Setup.Get("LoginAuthEmail").ToString.BeforeFirst("¨")
+                If Setup.Get("LoginRemember") Then TextPass.Password = Setup.Get("LoginAuthPass").ToString.BeforeFirst("¨").Trim
            End If
        End If
        IsFirstLoad = False
@@ -26,7 +26,7 @@ Public Class PageLoginLegacy
                ComboName.ItemsSource = Nothing
            Else
                ComboName.ItemsSource = Setup.Get("LoginLegacyName").ToString.Split("¨")
-                ComboName.Text = Setup.Get("LoginLegacyName").ToString.Before("¨").Trim
+                ComboName.Text = Setup.Get("LoginLegacyName").ToString.BeforeFirst("¨").Trim
            End If
        End If
        IsReloaded = True
@@ -17,8 +17,8 @@
                ComboName.ItemsSource = Nothing
            Else
                ComboName.ItemsSource = Setup.Get("LoginNideEmail").ToString.Split("¨")
-                ComboName.Text = Setup.Get("LoginNideEmail").ToString.Before("¨")
-                If Setup.Get("LoginRemember") Then TextPass.Password = Setup.Get("LoginNidePass").ToString.Before("¨").Trim
+                ComboName.Text = Setup.Get("LoginNideEmail").ToString.BeforeFirst("¨")
+                If Setup.Get("LoginRemember") Then TextPass.Password = Setup.Get("LoginNidePass").ToString.BeforeFirst("¨").Trim
            End If
        End If
        IsFirstLoad = False