2.12.8.1

Plain Craft Launcher 2/Pages/PageInstance/MyLocalModItem.xaml

@@ -3,7 +3,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:local="clr-namespace:PCL;assembly="
       x:Name="PanBack" Height="44"
-      RenderTransformOrigin="0.5,0.5" Background="{StaticResource ColorBrushSemiTransparent}" SnapsToDevicePixels="True" Cursor="Hand">
+      RenderTransformOrigin="0.5,0.5" Background="{StaticResource ColorBrushSemiTransparent}" SnapsToDevicePixels="True">
     <Grid.ColumnDefinitions>
         <ColumnDefinition Width="6" />
         <ColumnDefinition Width="34" />

Plain Craft Launcher 2/Pages/PageInstance/PageInstanceExport.xaml

@@ -222,6 +222,15 @@
                         <StackPanel Margin="30,0,0,0" x:Name="PanOptionsSaves"
                                 Visibility="{Binding Checked, ElementName=CheckOptionsSaves, Converter={StaticResource BooleanToVisibilityConverter}}">
                         </StackPanel>
+                        <local:MyCheckBox>
+                            <local:MyCheckBox.Tag>
+                                <local:ExportOption 
+                                Title="协议"
+                                Description="Licence 文件"
+                                Rules="LICEN*"
+                                DefaultChecked="True" />
+                            </local:MyCheckBox.Tag>
+                        </local:MyCheckBox>
                         <local:MyCheckBox>
                             <local:MyCheckBox.Tag>
                                 <local:ExportOption 

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

@@ -119,7 +119,7 @@ Public Class PageInstanceExport
                 If Rule.StartsWithF("!") Then Return False '只看正向规则
                 '检查前两级
                 Try
-                    If AllEntries.Any(Function(Entry) Entry Like Rule) Then Return True
+                    If AllEntries.Any(Function(Entry) Entry.Lower Like Rule.Lower) Then Return True
                 Catch ex As Exception
                     Logger.Error(ex, $"错误的规则：{Rule}", LogBehavior.Toast)
                     Return False
@@ -482,7 +482,7 @@ Public Class PageInstanceExport
                     Dim ShouldKeep As Boolean = False
                     For Each Rule In AllRules
                         Dim Revert = Rule.StartsWithF("!")
-                        If RelativePath Like Rule.TrimStart("!") Then ShouldKeep = Not Revert
+                        If RelativePath.Lower Like Rule.TrimStart("!").Lower Then ShouldKeep = Not Revert
                     Next
                     If Not ShouldKeep Then Continue For
                     Dim TargetPath As String = OverridesFolder & RelativePath
@@ -641,7 +641,7 @@ Public Class PageInstanceExport
                 Dim ModFile As LocalResourceFile = Pair.Key
                 Files.Add(New JObject From {
                     {"path", PathUtils.RemoveExtendedPrefix(ModFile.File.FullName).AfterFirst(OverridesFolder).Replace("\", "/")},
-                    {"hashes", New JObject From {{"sha1", ModFile.ModrinthHash}, {"sha512", HashUtils.ComputeFromFile(ModFile.File.FullName, HashUtils.HashMethod.Sha512)}}},
+                    {"hashes", New JObject From {{"sha1", ModFile.ModrinthHash}, {"sha512", CryptographyUtils.ComputeFileHash(ModFile.File.FullName, CryptographyUtils.HashMethod.Sha512)}}},
                     {"downloads", New JArray(Pair.Value.OrderBy(Function(u) u.Contains("modrinth.com")))}, '不优先选择 Modrinth
                     {"fileSize", ModFile.File.Length}
                 })

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

@@ -483,7 +483,7 @@ Install:
                 If FileUtils.Exists(NewPath) Then
                     If FileUtils.Exists(ModEntity.File.FullName) Then
                         '同时存在两个名称的 Mod
-                        If HashUtils.ComputeFromFile(ModEntity.File.FullName, HashUtils.HashMethod.Md5) <> HashUtils.ComputeFromFile(NewPath, HashUtils.HashMethod.Md5) Then
+                        If CryptographyUtils.ComputeFileHash(ModEntity.File.FullName) <> CryptographyUtils.ComputeFileHash(NewPath) Then
                             MyMsgBox($"目前同时存在启用和禁用的两个 Mod 文件：{vbCrLf} - {PathUtils.GetLastPart(NewPath)}{vbCrLf} - {ModEntity.File.Name}{vbCrLf}{vbCrLf}注意，这两个文件的内容并不相同。{vbCrLf}在手动删除或重命名其中一个文件后，才能继续操作。", "存在文件冲突")
                             Continue For
                         End If
@@ -608,8 +608,8 @@ Install:
                     Next
                     For Each Entry As KeyValuePair(Of String, String) In FileCopyList
                         If FileUtils.Exists(Entry.Value) Then
-                            FileUtils.Delete(Entry.Value, True)
                             Logger.Warn($"更新后的 Mod 文件已存在，将会把它放入回收站：{Entry.Value}")
+                            FileUtils.Delete(Entry.Value, True)
                         End If
                         If DirectoryUtils.Exists(PathUtils.RemoveLastPart(Entry.Value)) Then
                             FileUtils.Move(Entry.Key, Entry.Value)
@@ -723,18 +723,10 @@ Install:
             End If
             '显示结果提示
             If Not IsSuccessful Then Return
-            If IsShiftPressed Then
-                If ModList.IsSingle Then
-                    Hint($"已彻底删除 {ModList.Single.File.Name}！", HintType.Green)
-                Else
-                    Hint($"已彻底删除 {ModList.Count} 个文件！", HintType.Green)
-                End If
+            If ModList.IsSingle Then
+                Hint($"已删除 {ModList.Single.File.Name}！", HintType.Green)
             Else
-                If ModList.IsSingle Then
-                    Hint($"已将 {ModList.Single.File.Name} 删除到回收站！", HintType.Green)
-                Else
-                    Hint($"已将 {ModList.Count} 个文件删除到回收站！", HintType.Green)
-                End If
+                Hint($"已删除 {ModList.Count} 个文件！", HintType.Green)
             End If
         Catch ex As OperationCanceledException
             Logger.Warn(ex, "删除 Mod 被主动取消")