Merge branch 'Hex-Dragon:main' into Server

.github/workflows/build.yml

@@ -1,5 +1,4 @@
 name: Build
-
 on:
  push:
  paths:
@@ -12,37 +11,35 @@ on:
  workflow_dispatch:
 
 jobs:
-
  build:
-
- strategy: 
- matrix: 
- configuration: [Debug, Release, Snapshot, BETA, ReleaseUpdate]
-
+ name: Build
  runs-on: windows-latest
-
+ strategy: 
+ matrix: 
+ configuration: [Debug, Release]
  steps:
  - name: Checkout
  uses: actions/checkout@v4
  with:
  fetch-depth: 0
-
  - name: Set Describe
  shell: bash
  run: |
- Describe=`git describe --tags --always`
- echo "Describe=$Describe" >> $GITHUB_ENV
-
+ describe=`git describe --tags --always`
+ echo "describe=$describe" >> $GITHUB_ENV
  - name: Setup MSBuild.exe
  uses: microsoft/setup-msbuild@v2
  with:
  msbuild-architecture: x64
-
+ - name: Replace
+ run: |
+ (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Public Const OAuthClientId As String = ""', 'Public Const OAuthClientId As String = "${{ secrets.CLIENT_ID }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb"
+ (gc "Plain Craft Launcher 2\Modules\ModSecret.vb") -replace 'Public Const CurseForgeAPIKey As String = ""', 'Public Const CurseForgeAPIKey As String = "${{ secrets.CURSEFORGE_API_KEY }}"' | Out-File "Plain Craft Launcher 2\Modules\ModSecret.vb"
+ (gc "Plain Craft Launcher 2\Modules\Base\ModBase.vb") -replace 'Public Const CommitHash As String = ""', 'Public Const CommitHash As String = "${{ github.sha }}"' | Out-File "Plain Craft Launcher 2\Modules\Base\ModBase.vb"
  - name: Build
  run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ matrix.configuration }}
-
  - name: Upload a Build Artifact
  uses: actions/upload-artifact@v4
  with:
- name: ${{ matrix.configuration }} ${{ env.Describe }}
+ name: ${{ matrix.configuration }} ${{ env.describe }}
  path: Plain Craft Launcher 2\obj\${{ matrix.configuration }}\Plain Craft Launcher 2.exe

Plain Craft Launcher 2/Application.xaml.vb

@@ -96,23 +96,20 @@ Public Class Application
  End If
  '动态 DLL 调用
  AddHandler AppDomain.CurrentDomain.AssemblyResolve, AddressOf AssemblyResolve
- SetDllDirectory(Path & "PCL\")
- If Is32BitSystem Then
- File.WriteAllBytes(Path & "PCL\libwebp.dll", GetResources("libwebp32"))
- Else
- File.WriteAllBytes(Path & "PCL\libwebp.dll", GetResources("libwebp64"))
- End If
  '日志初始化
  LogStart()
  '添加日志
- Log($"[Start] 程序版本：{VersionDisplayName} ({VersionCode})")
+ Log($"[Start] 程序版本：{VersionDisplayName} ({VersionCode}{If(CommitHash = "", "", $"，#{CommitHash}")})")
  Log($"[Start] 识别码：{UniqueAddress}{If(ThemeCheckOne(9), "，已解锁反馈主题", "")}")
  Log($"[Start] 程序路径：{PathWithName}")
  Log($"[Start] 系统编码：{Encoding.Default} ({Encoding.Default.CodePage}, GBK={IsGBKEncoding})")
  Log($"[Start] 管理员权限：{IsAdmin()}")
- '检测压缩包运行
+ '检测异常环境
  If Path.Contains(IO.Path.GetTempPath()) OrElse Path.Contains("AppData\Local\Temp\") Then
- MyMsgBox("PCL 正在临时文件夹运行，设置、游戏存档等很可能无法保存，且部分功能会无法使用或出错。" & vbCrLf & "请将 PCL 从压缩文件中解压，或是更换文件夹后再继续使用！", "环境警告", "我知道了", IsWarn:=True)
+ MyMsgBox("请将 PCL 从压缩文件中解压，或是更换文件夹后再继续使用！" & vbCrLf & "程序目前在临时文件夹中运行，设置、游戏存档等可能无法保存，且部分功能将无法使用。", "环境警告", "我知道了", IsWarn:=True)
+ End If
+ If Is32BitSystem Then
+ MyMsgBox("PCL 和新版 Minecraft 均不再支持 32 位系统，部分功能将无法使用。" & vbCrLf & "非常建议重装为 64 位系统后再进行游戏！", "环境警告", "我知道了", IsWarn:=True)
  End If
  '设置初始化
  Setup.Load("SystemDebugMode")
@@ -177,11 +174,12 @@ Public Class Application
  Private Shared AssemblyNAudio As Assembly
  Private Shared AssemblyJson As Assembly
  Private Shared AssemblyDialog As Assembly
- Private Shared AssemblyWebp As Assembly
+ Private Shared AssemblyImazenWebp As Assembly
  Private Shared ReadOnly AssemblyNAudioLock As New Object
  Private Shared ReadOnly AssemblyJsonLock As New Object
  Private Shared ReadOnly AssemblyDialogLock As New Object
- Private Shared ReadOnly AssemblyWebpLock As New Object
+ Private Shared ReadOnly AssemblyImazenWebpLock As New Object
+ Private Declare Function SetDllDirectory Lib "kernel32" Alias "SetDllDirectoryA" (lpPathName As String) As Boolean
  Public Shared Function AssemblyResolve(sender As Object, args As ResolveEventArgs) As Assembly
  If args.Name.StartsWithF("NAudio") Then
  SyncLock AssemblyNAudioLock
@@ -208,12 +206,14 @@ Public Class Application
  Return AssemblyDialog
  End SyncLock
  ElseIf args.Name.StartsWithF("Imazen.WebP") Then
- SyncLock AssemblyWebpLock
- If AssemblyWebp Is Nothing Then
+ SyncLock AssemblyImazenWebpLock
+ If AssemblyImazenWebp Is Nothing Then
  Log("[Start] 加载 DLL：Imazen.WebP")
- AssemblyWebp = Assembly.Load(GetResources("WebP"))
+ AssemblyImazenWebp = Assembly.Load(GetResources("Imazen_WebP"))
+ SetDllDirectory(PathTemp)
+ File.WriteAllBytes(PathTemp & "libwebp.dll", GetResources("libwebp64"))
  End If
- Return AssemblyWebp
+ Return AssemblyImazenWebp
  End SyncLock
  Else
  Return Nothing

Plain Craft Launcher 2/Controls/MyIconTextButton.xaml.vb

@@ -46,18 +46,18 @@
  Black
  Highlight
  End Enum
- Private _ColorType As ColorState = ColorState.Black
  Public Property ColorType As ColorState
  Get
- Return _ColorType
+ Return GetValue(ColorTypeProperty)
  End Get
  Set(value As ColorState)
- _ColorType = value
+ If ColorType = value Then Return
+ SetValue(ColorTypeProperty, value)
  RefreshColor()
  End Set
  End Property '颜色类别
  Public Shared ReadOnly ColorTypeProperty As DependencyProperty =
- DependencyProperty.Register("ColorType", GetType(ColorState), GetType(MyIconTextButton), New PropertyMetadata())
+ DependencyProperty.Register("ColorType", GetType(ColorState), GetType(MyIconTextButton), New PropertyMetadata(ColorState.Black))
 
  '点击事件
 

Plain Craft Launcher 2/FormMain.xaml

@@ -166,7 +166,7 @@
  </Border>
  </Border>
  </Grid>
- <StackPanel x:Name="PanHint" IsHitTestVisible="False" UseLayoutRounding="True" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="0,0,0,25" Grid.RowSpan="2" />
+ <StackPanel x:Name="PanHint" IsHitTestVisible="False" UseLayoutRounding="True" SnapsToDevicePixels="True" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="0,0,0,20" Grid.RowSpan="2" />
  <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" Margin="15">
  <local:MyExtraButton x:Name="BtnExtraBack" HorizontalAlignment="Right" VerticalAlignment="Center" ToolTip="返回顶部" Visibility="Collapsed"
  Logo="M858.496 188.9024 173.1072 188.9024c-30.2848 0-54.8352-24.5504-54.8352-54.8352L118.272 106.6496c0-30.2848 24.5504-54.8352 54.8352-54.8352l685.3888 0c30.2848 0 54.8352 24.5504 54.8352 54.8352l0 27.4176C913.3312 164.352 888.7808 188.9024 858.496 188.9024L858.496 188.9024zM150.6048 550.8608c0 0 300.0064-240.3584 303.0272-243.328 13.9776-13.5936 31.1808-21.8624 48.8192-24.7552 1.7152-0.3072 3.4304-0.5888 5.1456-0.768 2.7392-0.3072 5.4528-0.3584 8.192-0.3328 2.7392-0.0256 5.4272 0.0256 8.1664 0.3328 1.7408 0.1792 3.4304 0.4864 5.1456 0.768 17.664 2.8928 34.8672 11.1616 48.8192 24.7552 3.0464 2.944 303.0016 243.328 303.0016 243.328 32.384 31.5136 29.6192 63.9744-2.7392 95.5136-32.3328 31.5392-75.648 2.9696-108.0064-28.544l-185.8816-147.1232 0 485.8368c0 30.3104-24.5248 54.8608-54.8352 54.8608l-27.392 0c-30.2848 0-54.8352-24.5504-54.8352-54.8608L447.232 470.7072l-185.8304 147.0976c-32.3584 31.5392-75.6992 60.1344-108.032 28.5696C121.0368 614.8352 118.272 582.3744 150.6048 550.8608L150.6048 550.8608zM150.6048 550.8608" />

Plain Craft Launcher 2/FormMain.xaml.vb

@@ -134,6 +134,14 @@ Public Class FormMain
  '3：BUG+ IMP* FEAT-
  '2：BUG* IMP-
  '1：BUG-
+ If LastVersion < 337 Then 'Snapshot 2.8.7
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "使用新的正版登录方式，以提高安全性"))
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化安装整合包、检索 Mod 的稳定性"))
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法加载部分 Mod 的图标的 Bug"))
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复在 Mod 管理页面删除 Mod 导致报错的 Bug"))
+ FeatureCount += 11
+ BugCount += 21
+ End If
  If LastVersion < 335 Then 'Snapshot 2.8.6
  BugCount += 2
  End If
@@ -432,6 +440,10 @@ Public Class FormMain
  Height = MinHeight + 50
  Width = MinWidth + 50
  End Try
+#If DEBUG Then
+ MinHeight = 50
+ MinWidth = 50
+#End If
  Topmost = False
  If FrmStart IsNot Nothing Then FrmStart.Close(New TimeSpan(0, 0, 0, 0, 400 / AniSpeed))
  '更改窗口
@@ -1011,18 +1023,19 @@ Install:
  ''' 把当前窗口拖到最前面。
  ''' </summary>
  Public Sub ShowWindowToTop()
- RunInUi(Sub()
- '这一坨乱七八糟的，别改，改了指不定就炸了，自己电脑还复现不出来
- Visibility = Visibility.Visible
- ShowInTaskbar = True
- WindowState = WindowState.Normal
- Hidden = False
- Topmost = True '偶尔 SetForegroundWindow 失效
- Topmost = False
- SetForegroundWindow(Handle)
- Focus()
- Log("[System] 窗口已置顶，位置：(" & Left & ", " & Top & "), " & Width & " x " & Height)
- End Sub)
+ RunInUi(
+ Sub()
+ '这一坨乱七八糟的，别改，改了指不定就炸了，自己电脑还复现不出来
+ Visibility = Visibility.Visible
+ ShowInTaskbar = True
+ WindowState = WindowState.Normal
+ Hidden = False
+ Topmost = True '偶尔 SetForegroundWindow 失效
+ Topmost = False
+ SetForegroundWindow(Handle)
+ Focus()
+ Log($"[System] 窗口已置顶，位置：({Left}, {Top}), {Width} x {Height}")
+ End Sub)
  End Sub
 
 #End Region

Plain Craft Launcher 2/Modules/Base/ModBase.vb

@@ -1,4 +1,5 @@
-Imports System.IO.Compression
+Imports System.Globalization
+Imports System.IO.Compression
 Imports System.Runtime.CompilerServices
 Imports System.Security.Cryptography
 Imports System.Security.Principal
@@ -11,12 +12,13 @@ Public Module ModBase
 #Region "声明"
 
  '下列版本信息由更新器自动修改
- Public Const VersionBaseName As String = "2.8.6" '不含分支前缀的显示用版本名
- Public Const VersionStandardCode As String = "2.8.6." & VersionBranchCode '标准格式的四段式版本号
+ Public Const VersionBaseName As String = "2.8.7" '不含分支前缀的显示用版本名
+ Public Const VersionStandardCode As String = "2.8.7." & VersionBranchCode '标准格式的四段式版本号
+ Public Const CommitHash As String = "" 'Commit Hash，由 GitHub Workflow 自动替换
 #If BETA Then
  Public Const VersionCode As Integer = 336 'Release
 #Else
- Public Const VersionCode As Integer = 335 'Snapshot
+ Public Const VersionCode As Integer = 337 'Snapshot
 #End If
  '自动生成的版本信息
  Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName
@@ -64,7 +66,7 @@ Public Module ModBase
  ''' </summary>
  Public ApplicationOpenTime As Date = Date.Now
  ''' <summary>
- ''' 设备唯一标识符。
+ ''' 识别码。
  ''' </summary>
  Public UniqueAddress As String = SecretGetUniqueAddress()
  ''' <summary>
@@ -1240,9 +1242,15 @@ Re:
  Public Function DeleteDirectory(Path As String, Optional IgnoreIssue As Boolean = False) As Integer
  If Not Directory.Exists(Path) Then Return 0
  Dim DeletedCount As Integer = 0
- Dim Temp As String()
- Temp = Directory.GetFiles(Path)
- For Each FilePath As String In Temp
+ Dim Files As String()
+ Try
+ Files = Directory.GetFiles(Path)
+ Catch ex As DirectoryNotFoundException '#4549
+ Log(ex, $"疑似为孤立符号链接，尝试直接删除（{Path}）", LogLevel.Developer)
+ Directory.Delete(Path)
+ Return 0
+ End Try
+ For Each FilePath As String In Files
  Dim RetriedFile As Boolean = False
 RetryFile:
  Try
@@ -1261,8 +1269,7 @@ RetryFile:
  End If
  End Try
  Next
- Temp = Directory.GetDirectories(Path)
- For Each str As String In Temp
+ For Each str As String In Directory.GetDirectories(Path)
  DeleteDirectory(str, IgnoreIssue)
  Next
  Dim RetriedDir As Boolean = False
@@ -1444,14 +1451,14 @@ RetryDir:
  End Function
 
  ''' <summary>
- ''' 获取 Json 对象。
+ ''' 获取 JSON 对象。
  ''' </summary>
  Public Function GetJson(Data As String)
  Try
  Return JsonConvert.DeserializeObject(Data, New JsonSerializerSettings With {.DateTimeZoneHandling = DateTimeZoneHandling.Local})
  Catch ex As Exception
  Dim Length As Integer = If(Data, "").Length
- Throw New Exception("格式化 json 对象失败：" & If(Length > 10000, Data.Substring(0, 100) & $"...(全长 {Length} 个字符)..." & Right(Data, 100), Data))
+ Throw New Exception("格式化 JSON 失败：" & If(Length > 2000, Data.Substring(0, 500) & $"...(全长 {Length} 个字符)..." & Right(Data, 500), Data))
  End Try
  End Function
 
@@ -1855,6 +1862,13 @@ RetryDir:
  Return NewProcess.ExitCode
  End Function
 
+ ''' <summary>
+ ''' 判断当前系统语言是否为中文。
+ ''' </summary>
+ Public Function IsSystemLanguageChinese() As Boolean
+ Return CultureInfo.CurrentCulture.TwoLetterISOLanguageName = "zh" OrElse CultureInfo.CurrentUICulture.TwoLetterISOLanguageName = "zh"
+ End Function
+
  Private Uuid As Integer = 1
  Private UuidLock As Object
  ''' <summary>
@@ -2660,7 +2674,11 @@ Retry:
  End Sub
  Public Function CanFeedback(ShowHint As Boolean) As Boolean
  If False.Equals(PageSetupSystem.IsLauncherNewest) Then
- If ShowHint Then MyMsgBox("你的 PCL 不是最新版，因此无法提交反馈。" & vbCrLf & "请先在 设置 → 启动器 中更新启动器，确认该问题在最新版中依然存在，然后再提交反馈。", "无法提交反馈")
+ If ShowHint Then
+ If MyMsgBox($"你的 PCL 不是最新版，因此无法提交反馈。{vbCrLf}请在更新后，确认该问题在最新版中依然存在，然后再提交反馈。", "无法提交反馈", "更新", "取消") = 1 Then
+ UpdateCheckByButton()
+ End If
+ End If
  Return False
  Else
  Return True

Plain Craft Launcher 2/Modules/Base/ModLoader.vb

@@ -91,17 +91,18 @@
  _State = value
  Log("[Loader] 加载器 " & Name & " 状态改变：" & GetStringFromEnum(value))
  '实现 ILoadingTrigger 接口与 OnStateChanged 回调
- RunInUi(Sub()
- Select Case value
- Case LoadState.Loading
- LoadingState = MyLoading.MyLoadingState.Run
- Case LoadState.Failed
- LoadingState = MyLoading.MyLoadingState.Error
- Case Else
- LoadingState = MyLoading.MyLoadingState.Stop
- End Select
- RaiseEvent OnStateChangedUi(Me, value, OldState)
- End Sub)
+ RunInUi(
+ Sub()
+ Select Case value
+ Case LoadState.Loading
+ LoadingState = MyLoading.MyLoadingState.Run
+ Case LoadState.Failed
+ LoadingState = MyLoading.MyLoadingState.Error
+ Case Else
+ LoadingState = MyLoading.MyLoadingState.Stop
+ End Select
+ RaiseEvent OnStateChangedUi(Me, value, OldState)
+ End Sub)
  If HasOnStateChangedThread Then RunInThread(Sub() RaiseEvent OnStateChangedThread(Me, value, OldState))
  End Set
  End Property
@@ -566,7 +567,7 @@ Restart:
  End Class
 
  '任务栏进度条
- Public LoaderTaskbar As New Concurrent.ConcurrentBag(Of LoaderBase)
+ Public LoaderTaskbar As New SynchronizedCollection(Of LoaderBase)
  Public LoaderTaskbarProgress As Double = 0 '平滑后的进度
  Private LoaderTaskbarProgressLast As Shell.TaskbarItemProgressState = Shell.TaskbarItemProgressState.None
 
@@ -582,14 +583,14 @@ Restart:
  '检查任务是否完成，若完成则移除
  '外显任务是否已经全部完成
  Dim IsAllDownloadTaskCompleted As Boolean = True
- For Each Loader In LoaderTaskbar
+ For Each Loader In LoaderTaskbar.ToList()
  If Loader.State = LoadState.Loading Then IsAllDownloadTaskCompleted = False
  Next
  '若单个任务已中止或全部任务已完成，则刷新并移除
  For Each Task In LoaderTaskbar.ToList()
  If IsAllDownloadTaskCompleted OrElse Task.State = LoadState.Aborted OrElse Task.State = LoadState.Waiting Then
  If FrmSpeedLeft IsNot Nothing Then FrmSpeedLeft.TaskRefresh(Task)
- LoaderTaskbar.TryTake(Task)
+ LoaderTaskbar.Remove(Task)
  Log($"[Taskbar] {Task.Name} 已移出任务列表")
  End If
  Next