2.5.1

2023-03-08 23:34:10 +08:00
parent 36c10ade8c
commit d886acdeac
50 changed files with 781 additions and 659 deletions
@@ -9,6 +9,7 @@
        <StackPanel x:Name="PanMain" Margin="25,10">
            <local:MyCard x:Name="CardSkin" Margin="0,15" Title="离线皮肤">
                <StackPanel Margin="25,40,25,15">
+                    <local:MyHint Text="由于技术问题，皮肤预览与 Steve/Alex/自定义 选项暂时仅保证对 1.19.2 以前的版本有效！" IsWarn="False" Margin="0,0,0,10" />
                    <Grid Margin="-1,0,0,0">
                        <Grid.ColumnDefinitions>
                            <ColumnDefinition />
@@ -144,7 +145,7 @@
                            </local:MyTextBox>
                        </Grid>
                        <TextBlock VerticalAlignment="Center" Grid.Row="12" HorizontalAlignment="Left" Text="游戏 Java" Margin="0,0,25,0" />
-                        <local:MyComboBox x:Name="ComboArgumentJava" Grid.ColumnSpan="2" Grid.Row="12" Grid.Column="1" ToolTip="若将 Java 放在游戏文件夹或 PCL 文件夹，在进行自动选择时 PCL2 会尽量优先选择它">
+                        <local:MyComboBox x:Name="ComboArgumentJava" Grid.ColumnSpan="2" Grid.Row="12" Grid.Column="1" ToolTip="若将 Java 放在游戏文件夹或 PCL 文件夹，在进行自动选择时 PCL 会尽量优先选择它">
                            <ComboBoxItem Content="加载中……" IsSelected="True" />
                            <!--<local:MyComboBoxItem Content="Java 8 (1.8.0_171)，64 位：C:\Program Files (x86)\Common Files\Oracle\Java\javapath\javaw.exe" ToolTipService.Placement="Right" ToolTipService.HorizontalOffset="5" IsSelected="True" ToolTip="C:\Program Files (x86)\Common Files\Oracle\Java\javapath\javaw.exe" />-->
                        </local:MyComboBox>
@@ -220,13 +221,21 @@
                        <RowDefinition Height="28" />
                        <RowDefinition Height="9" />
                        <RowDefinition Height="28" />
+                        <RowDefinition Height="9" />
+                        <RowDefinition Height="28" />
+                        <RowDefinition Height="Auto" />
                        <RowDefinition Height="Auto" />
                    </Grid.RowDefinitions>
-                    <TextBlock Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" Text="JVM 参数" Margin="0,0,25,0" />
+                    <TextBlock Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" Text="JVM 参数头" Margin="0,0,25,0" />
                    <local:MyTextBox x:Name="TextAdvanceJvm" Grid.Row="0" Grid.ColumnSpan="2" Tag="LaunchAdvanceJvm" Grid.Column="1" ToolTip="启动 Minecraft 时使用的额外 JVM 参数，在没有确定把握的情况下请不要尝试修改。&#xa;你可以通过点击左侧选项卡的初始化按钮来恢复到默认设置。" Text="-XX:+UseG1GC -XX:-UseAdaptiveSizePolicy -XX:-OmitStackTraceInFastThrow -Dfml.ignoreInvalidMinecraftCertificates=True -Dfml.ignorePatchDiscrepancies=True -Dlog4j2.formatMsgNoLookups=true" />
-                    <TextBlock Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left" Text="额外参数" Margin="0,0,25,0" />
+                    <TextBlock Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left" Text="JVM 参数尾" Margin="0,0,25,0" />
                    <local:MyTextBox x:Name="TextAdvanceGame" Grid.Row="2" Grid.ColumnSpan="2" Tag="LaunchAdvanceGame" Grid.Column="1" ToolTip="文本框中的内容将会被直接拼合在启动参数的末尾。&#xa;例如输入 --demo 则会以试玩模式启动游戏。" />
-                    <StackPanel Margin="0,12,0,4" Orientation="Horizontal" Grid.Row="3" Grid.ColumnSpan="2">
+                    <TextBlock Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left" Text="启动前执行命令" Margin="0,0,25,0" />
+                    <local:MyTextBox x:Name="TextAdvanceRun" Grid.Row="4" Grid.ColumnSpan="2" Tag="LaunchAdvanceRun" Grid.Column="1" HintText=""
+                                     ToolTip="在 MC 启动前执行特定命令或程序，语法与 Windows 的命令提示符一致。&#xa;&#xa;可以使用以下替换标记实现相对路径（路径均以 \ 结尾）：&#xa; · {path}：PCL 的 exe 文件所在的文件夹&#xa; · {minecraft}：.minecraft 文件夹&#xa; · {verpath}：版本文件夹（.minecraft\versions\版本名\）&#xa; · {verindie}：开启版本隔离时等同版本文件夹，未开启时等同 .minecraft 文件夹&#xa; · {java}：游戏运行时的 Java 文件夹&#xa;&#xa;除此之外，也支持以下替换标记：&#xa; · {user}：玩家名字&#xa; · {login}：玩家的登录方式&#xa; · {uuid}：玩家的 UUID&#xa; · {name}：游戏版本名&#xa; · {time}：当前的系统时间&#xa; · {version}：游戏对应的原版版本号&#xa;&#xa;例如：&#xa; · &quot;{verpath}test.exe&quot; ：运行版本文件夹下的 test.exe 程序&#xa; · &quot;{java}java.exe&quot; -jar &quot;{verpath}test.jar&quot; ：用 Java 运行版本文件夹下的 test.jar&#xa; · notepad &quot;{verindie}option.txt&quot; ：使用记事本打开该版本的设置文件&#xa;&#xa;涉及路径的操作最好都打上双引号，以避免路径中的空格导致运行失败。" />
+                    <local:MyCheckBox Grid.Row="5" Grid.Column="1" x:Name="CheckAdvanceRunWait" Tag="LaunchAdvanceRunWait" Visibility="Collapsed"
+                                      Text="等待命令执行完成后再继续启动" Margin="0,8,0,7" />
+                    <StackPanel Margin="0,12,0,4" Orientation="Horizontal" Grid.Row="6" Grid.ColumnSpan="2">
                        <local:MyCheckBox Text="忽略 Java 兼容性警告" x:Name="CheckAdvanceJava" Tag="LaunchAdvanceJava" Margin="0,0,60,0"
                                        ToolTip="如果在设置中手动选择了与当前版本不兼容的 Java，则自动跳过兼容性警告弹窗，强制使用手动选择的 Java。" />
                        <local:MyCheckBox Text="关闭文件校验" x:Name="CheckAdvanceAssets" Tag="LaunchAdvanceAssets"
@@ -47,6 +47,8 @@
            '高级设置
            TextAdvanceJvm.Text = Setup.Get("LaunchAdvanceJvm")
            TextAdvanceGame.Text = Setup.Get("LaunchAdvanceGame")
+            TextAdvanceRun.Text = Setup.Get("LaunchAdvanceRun")
+            CheckAdvanceRunWait.Checked = Setup.Get("LaunchAdvanceRunWait")
            CheckAdvanceAssets.Checked = Setup.Get("LaunchAdvanceAssets")
            CheckAdvanceJava.Checked = Setup.Get("LaunchAdvanceJava")

@@ -77,6 +79,8 @@
            Setup.Reset("LaunchAdvanceGame")
            Setup.Reset("LaunchAdvanceJava")
            Setup.Reset("LaunchAdvanceAssets")
+            Setup.Reset("LaunchAdvanceRun")
+            Setup.Reset("LaunchAdvanceRunWait")

            Setup.Reset("LaunchArgumentJavaAll")
            Setup.Reset("LaunchArgumentJavaSelect")
@@ -95,7 +99,7 @@
    Private Shared Sub RadioBoxChange(sender As MyRadioBox, e As Object) Handles RadioSkinType0.Check, RadioSkinType1.Check, RadioSkinType2.Check, RadioSkinType3.Check, RadioSkinType4.Check, RadioRamType0.Check, RadioRamType1.Check
        If AniControlEnabled = 0 Then Setup.Set(sender.Tag.ToString.Split("/")(0), Val(sender.Tag.ToString.Split("/")(1)))
    End Sub
-    Private Shared Sub TextBoxChange(sender As MyTextBox, e As Object) Handles TextSkinID.ValidatedTextChanged, TextArgumentWindowHeight.ValidatedTextChanged, TextArgumentWindowWidth.ValidatedTextChanged, TextArgumentInfo.ValidatedTextChanged, TextAdvanceGame.ValidatedTextChanged, TextAdvanceJvm.ValidatedTextChanged, TextArgumentTitle.ValidatedTextChanged
+    Private Shared Sub TextBoxChange(sender As MyTextBox, e As Object) Handles TextSkinID.ValidatedTextChanged, TextArgumentWindowHeight.ValidatedTextChanged, TextArgumentWindowWidth.ValidatedTextChanged, TextArgumentInfo.ValidatedTextChanged, TextAdvanceGame.ValidatedTextChanged, TextAdvanceJvm.ValidatedTextChanged, TextArgumentTitle.ValidatedTextChanged, TextAdvanceRun.ValidatedTextChanged
        If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.Text)
    End Sub
    Private Shared Sub SliderChange(sender As MySlider, e As Object) Handles SliderRamCustom.Change
@@ -104,53 +108,58 @@
    Private Shared Sub ComboChange(sender As MyComboBox, e As Object) Handles ComboArgumentIndie.SelectionChanged, ComboArgumentVisibie.SelectionChanged, ComboArgumentWindowType.SelectionChanged, ComboArgumentPriority.SelectionChanged
        If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.SelectedIndex)
    End Sub
-    Private Shared Sub CheckBoxChange(sender As MyCheckBox, e As Object) Handles CheckAdvanceAssets.Change, CheckAdvanceJava.Change
+    Private Shared Sub CheckBoxChange(sender As MyCheckBox, e As Object) Handles CheckAdvanceAssets.Change, CheckAdvanceJava.Change, CheckAdvanceRunWait.Change
        If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.Checked)
    End Sub

 #Region "离线皮肤"

    Private Sub BtnSkinChange_Click(sender As Object, e As EventArgs) Handles BtnSkinChange.Click
-        Dim SkinInfo As McSkinInfo = McSkinSelect(True)
+        Dim SkinInfo As McSkinInfo = McSkinSelect()
        If Not SkinInfo.IsVaild Then Exit Sub
-        '设置文件
-        Try
-            '拷贝文件
-            File.Delete(PathAppdata & "CustomSkin.png")
-            CopyFile(SkinInfo.LocalFile, PathAppdata & "CustomSkin.png")
-            '更新设置
-            Setup.Set("LaunchSkinSlim", SkinInfo.IsSlim)
-        Catch ex As Exception
-            Log(ex, "设置离线皮肤失败", LogLevel.Msgbox)
-        Finally
-            '设置当前显示
-            PageLaunchLeft.SkinLegacy.Start(IsForceRestart:=True)
-        End Try
+        ChangeSkin(SkinInfo)
    End Sub
    Private Sub RadioSkinType3_Check(sender As Object, e As RouteEventArgs) Handles RadioSkinType4.PreviewCheck
        If Not (AniControlEnabled = 0 AndAlso e.RaiseByMouse) Then Exit Sub
+        '已有图片则不再选择
+        If File.Exists(PathAppdata & "CustomSkin.png") Then Exit Sub
+        '没有图片则要求选择
+        Dim SkinInfo As McSkinInfo = McSkinSelect()
+        If Not SkinInfo.IsVaild Then
+            e.Handled = True
+            Exit Sub
+        End If
+        '正式改变
+        If Not ChangeSkin(SkinInfo) Then e.Handled = True
+    End Sub
+    '返回是否成功改变
+    Private Function ChangeSkin(SkinInfo As McSkinInfo) As Boolean
        Try
-            '已有图片则不再选择
-            If File.Exists(PathAppdata & "CustomSkin.png") Then Exit Sub
-            '没有图片则要求选择
-            Dim SkinInfo As McSkinInfo = McSkinSelect(True)
-            If Not SkinInfo.IsVaild Then
-                e.Handled = True
-                Exit Sub
-            End If
            '拷贝文件
            File.Delete(PathAppdata & "CustomSkin.png")
            CopyFile(SkinInfo.LocalFile, PathAppdata & "CustomSkin.png")
+            '将单层皮肤扩展到双层
+            Dim Bitmap As New MyBitmap(PathAppdata & "CustomSkin.png")
+            If Bitmap.Pic.Width = 64 AndAlso Bitmap.Pic.Height = 32 Then
+                Dim Img As System.Drawing.Image = Bitmap
+                Dim NewBitmap As New System.Drawing.Bitmap(64, 64)
+                Using g As System.Drawing.Graphics = System.Drawing.Graphics.FromImage(NewBitmap)
+                    g.DrawImageUnscaled(Img, New System.Drawing.Point(0, 0))
+                End Using
+                File.Delete(PathAppdata & "CustomSkin.png")
+                NewBitmap.Save(PathAppdata & "CustomSkin.png")
+            End If
            '更新设置
            Setup.Set("LaunchSkinSlim", SkinInfo.IsSlim)
+            ChangeSkin = True
        Catch ex As Exception
-            Log(ex, "设置离线皮肤失败", LogLevel.Msgbox)
-            e.Handled = True
+            Log(ex, "改变离线皮肤失败", LogLevel.Msgbox)
+            ChangeSkin = False
        Finally
            '设置当前显示
            PageLaunchLeft.SkinLegacy.Start(IsForceRestart:=True)
        End Try
-    End Sub
+    End Function
    Private Sub BtnSkinDelete_Click(sender As Object, e As EventArgs) Handles BtnSkinDelete.Click
        Try
            File.Delete(PathAppdata & "CustomSkin.png")
@@ -552,4 +561,12 @@ PreFin:

 #End Region

+#Region "高级设置"
+
+    Private Sub TextAdvanceRun_TextChanged(sender As Object, e As TextChangedEventArgs) Handles TextAdvanceRun.TextChanged
+        CheckAdvanceRunWait.Visibility = If(TextAdvanceRun.Text = "", Visibility.Collapsed, Visibility.Visible)
+    End Sub
+
+#End Region
+
 End Class
@@ -102,7 +102,7 @@
                        <local:MyComboBoxItem Content="关闭所有公告" />
                    </local:MyComboBox>
                    <TextBlock Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left" Text="缓存文件夹" Margin="0,0,25,0" />
-                    <local:MyTextBox x:Name="TextSystemCache" Grid.Row="4" Grid.ColumnSpan="2" Tag="SystemSystemCache" Grid.Column="1" ToolTip="PCL2 的下载、皮肤等缓存文件的存储位置。&#xa;不推荐路径中带有空格。&#xa;留空即为默认值，重启 PCL2 后生效。" HintText="默认">
+                    <local:MyTextBox x:Name="TextSystemCache" Grid.Row="4" Grid.ColumnSpan="2" Tag="SystemSystemCache" Grid.Column="1" ToolTip="PCL 的下载、皮肤等缓存文件的存储位置。&#xa;不推荐路径中带有空格。&#xa;留空即为默认值，重启 PCL 后生效。" HintText="默认">
                        <local:MyTextBox.ValidateRules>
                            <local:ValidateNullable />
                            <local:ValidateFolderPath UseMinecraftCharCheck="False" />
@@ -111,10 +111,8 @@
                    <Grid Height="35" Grid.Row="6" Grid.ColumnSpan="5" Margin="0,5,0,0">
                        <Grid.ColumnDefinitions>
                            <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
-                            <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
                        </Grid.ColumnDefinitions>
                        <local:MyButton x:Name="BtnSystemUpdate" MinWidth="140" Text="检查更新" Padding="13,0" Margin="0,0,20,0" />
-                        <local:MyButton x:Name="BtnSystemCacheClear" MinWidth="140" Text="清理缓存" Padding="13,0" Margin="0,0,20,0" Grid.Column="1" />
                    </Grid>
                </Grid>
            </local:MyCard>
@@ -154,65 +154,6 @@
        If AniControlEnabled = 0 Then Hint("部分调试信息将在刷新或启动器重启后切换显示！",, False)
    End Sub

-    '清理缓存
-    Private IsClearingCache As Boolean = False
-    Private Sub BtnSystemCacheClear_Click(sender As Object, e As EventArgs) Handles BtnSystemCacheClear.Click
-        If HasDownloadingTask() Then
-            Hint("请在所有下载任务完成后再清理缓存！", HintType.Critical)
-            Exit Sub
-        End If
-        If PathTemp = IO.Path.GetTempPath() & "PCL\" Then
-            If MyMsgBox("你确定要清理缓存吗？" & vbCrLf & "在清理缓存后，PCL2 会被强制关闭，以避免缓存缺失带来的异常。", "清理确认", "确定", "取消") = 2 Then
-                Exit Sub
-            End If
-        Else
-            If MyMsgBox("你已将缓存文件夹手动修改为：" & PathTemp & vbCrLf &
-                        "清理缓存将删除你所设置的这一文件夹中的所有内容，且无法恢复！" & vbCrLf &
-                        "请在继续前，确认其中没有除了 PCL2 缓存以外的重要文件！" & vbCrLf & vbCrLf &
-                        "在清理缓存后，PCL2 会被强制关闭，以避免缓存缺失带来的异常。", "清理确认", "永久删除该文件夹", "取消", IsWarn:=True) = 2 Then
-                Exit Sub
-            End If
-        End If
-        If IsClearingCache Then Exit Sub
-        IsClearingCache = True
-        Try
-            Dim TotalSize As ULong = DeleteCacheDirectory(PathTemp)
-            DeleteDirectory(PathTemp, True)
-            TotalSize += DeleteCacheDirectory(OsDrive & "ProgramData\PCL\")
-            DeleteDirectory(OsDrive & "ProgramData\PCL\", True)
-            If TotalSize <= 0 Then
-                Hint("没有可清理的缓存！")
-            Else
-                MyMsgBox("已清理 " & GetString(TotalSize) & " 缓存！" & vbCrLf & "PCL2 即将自动关闭。", "缓存已清理", ForceWait:=True)
-                FrmMain.EndProgram(False)
-            End If
-        Catch ex As Exception
-            Log(ex, "清理缓存失败", LogLevel.Hint)
-        Finally
-            IsClearingCache = False
-        End Try
-    End Sub
-    Private Function DeleteCacheDirectory(Path As String, Optional TotalSize As ULong = 0) As ULong
-        If Not Directory.Exists(Path) Then Return TotalSize
-        Dim Temp As String()
-        Temp = Directory.GetFiles(Path)
-        For Each str As String In Temp
-            Try
-                Dim Info As New FileInfo(str)
-                Dim FileActualSize = Math.Ceiling(Info.Length / 4096) * 4096
-                Info.Delete()
-                TotalSize += FileActualSize
-            Catch ex As Exception
-                Log(ex, "删除失败的缓存文件（" & str & "）")
-            End Try
-        Next
-        Temp = Directory.GetDirectories(Path)
-        For Each str As String In Temp
-            TotalSize += DeleteCacheDirectory(str)
-        Next
-        Return TotalSize
-    End Function
-
    '自动更新
    Private Sub ComboSystemActivity_SizeChanged(sender As Object, e As SelectionChangedEventArgs) Handles ComboSystemActivity.SelectionChanged
        If AniControlEnabled <> 0 Then Exit Sub