diff --git a/Plain Craft Launcher 2/Application.xaml.vb b/Plain Craft Launcher 2/Application.xaml.vb index 4c66c77..4233f8f 100644 --- a/Plain Craft Launcher 2/Application.xaml.vb +++ b/Plain Craft Launcher 2/Application.xaml.vb @@ -31,7 +31,7 @@ Public Class Application '内存优化 Dim Ram = My.Computer.Info.AvailablePhysicalMemory Try - PageOtherTest.MemoryOptimizeInternal() + PageOtherTest.MemoryOptimizeInternal(False) Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "内存优化失败") Environment.Exit(-1) @@ -114,7 +114,7 @@ WaitRetry: Log($"[Start] 管理员权限：{IsAdmin()}") '检测异常环境 If Path.Contains(IO.Path.GetTempPath()) OrElse Path.Contains("AppData\Local\Temp\") Then - MyMsgBox("请将 PCL 从压缩文件中解压，或是更换文件夹后再继续使用！" & vbCrLf & "程序目前在临时文件夹中运行，设置、游戏存档等可能无法保存，且部分功能将无法使用。", "环境警告", "我知道了", IsWarn:=True) + MyMsgBox("请将 PCL 从压缩包中解压之后再使用！" & vbCrLf & "在当前环境下运行可能会导致丢失游戏存档或设置，部分功能也可能无法使用！", "环境警告", "我知道了", IsWarn:=True) End If If Is32BitSystem Then MyMsgBox("PCL 和新版 Minecraft 均不再支持 32 位系统，部分功能将无法使用。" & vbCrLf & "非常建议重装为 64 位系统后再进行游戏！", "环境警告", "我知道了", IsWarn:=True) diff --git a/Plain Craft Launcher 2/Controls/MyImage.vb b/Plain Craft Launcher 2/Controls/MyImage.vb index 0a950f7..92ba1c0 100644 --- a/Plain Craft Launcher 2/Controls/MyImage.vb +++ b/Plain Craft Launcher 2/Controls/MyImage.vb @@ -128,8 +128,8 @@ RetryStart: '下载 ActualSource = LoadingSource '显示加载中图片 TempDownloadingPath = TempPath & RandomInteger(0, 10000000) - Directory.CreateDirectory(GetPathFromFullPath(TempPath)) - Using Client As New System.Net.WebClient + Directory.CreateDirectory(GetPathFromFullPath(TempPath)) '重新实现下载，以避免携带 Header（#5072） + Using Client As New Net.WebClient Client.DownloadFile(Url, TempDownloadingPath) End Using If Url <> Source AndAlso Url <> FallbackSource Then diff --git a/Plain Craft Launcher 2/Controls/MyListItem.xaml.vb b/Plain Craft Launcher 2/Controls/MyListItem.xaml.vb index 85bb421..02594cf 100644 --- a/Plain Craft Launcher 2/Controls/MyListItem.xaml.vb +++ b/Plain Craft Launcher 2/Controls/MyListItem.xaml.vb @@ -654,6 +654,8 @@ Dim Unused = New HelpEntry(GetEventAbsoluteUrls(EventData, EventType)(0)).SetToListItem(Me) Catch ex As Exception Log(ex, "设置帮助 MyListItem 失败", LogLevel.Msgbox) + EventType = Nothing + EventData = Nothing End Try End If End Sub diff --git a/Plain Craft Launcher 2/Controls/MyRadioButton.xaml b/Plain Craft Launcher 2/Controls/MyRadioButton.xaml index e5753e0..aa42f53 100644 --- a/Plain Craft Launcher 2/Controls/MyRadioButton.xaml +++ b/Plain Craft Launcher 2/Controls/MyRadioButton.xaml @@ -4,6 +4,6 @@ HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource ColorBrushSemiTransparent}" CornerRadius="13.5" MinHeight="27" MaxHeight="27"> - + diff --git a/Plain Craft Launcher 2/Controls/MyScrollViewer.vb b/Plain Craft Launcher 2/Controls/MyScrollViewer.vb index ad18da9..42da890 100644 --- a/Plain Craft Launcher 2/Controls/MyScrollViewer.vb +++ b/Plain Craft Launcher 2/Controls/MyScrollViewer.vb @@ -45,4 +45,7 @@ ScrollBar = GetTemplateChild("PART_VerticalScrollBar") End Sub + Private Sub MyScrollViewer_PreviewGotKeyboardFocus(sender As Object, e As KeyboardFocusChangedEventArgs) Handles Me.PreviewGotKeyboardFocus + If e.NewFocus IsNot Nothing AndAlso TypeOf e.NewFocus Is MySlider Then e.Handled = True '#3854，阻止获得焦点时自动滚动 + End Sub End Class diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index 35d01e2..2c06c45 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -82,8 +82,13 @@ Public Class FormMain '3：BUG+ IMP* FEAT- '2：BUG* IMP- '1：BUG- + If LastVersion < 344 Then 'Snapshot 2.8.11 + FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "Mod 管理页面添加下载 Mod、安装 Mod 选项")) + FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "Mod 详情页面支持按加载器、游戏版本进行分类和筛选")) + FeatureCount += 23 + BugCount += 21 + End If If LastVersion < 343 Then 'Snapshot 2.8.10 - FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "Mod 详情页面会按 Mod 加载器分类卡片")) FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持安装同时包含 modpack 文件和启动器的懒人包")) FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "优化整合包导入流程")) FeatureCount += 20 @@ -295,10 +300,10 @@ Public Class FormMain Height = MinHeight + 100 Width = MinWidth + 100 End Try -#If DEBUG Then - MinHeight = 50 - MinWidth = 50 -#End If + '#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)) '更改窗口 @@ -329,7 +334,7 @@ Public Class FormMain 'EULA 提示 If Not Setup.Get("SystemEula") Then Select Case MyMsgBox("在使用 PCL 前，请同意 PCL 的用户协议与免责声明。", "协议授权", "同意", "拒绝", "查看用户协议与免责声明", - Button3Action:=Sub() OpenWebsite("https://shimo.im/docs/rGrd8pY8xWkt6ryW")) + Button3Action:=Sub() OpenWebsite("https://shimo.im/docs/rGrd8pY8xWkt6ryW")) Case 1 Setup.Set("SystemEula", True) Case 2 @@ -782,47 +787,8 @@ Public Class FormMain End Sub) Exit Sub End If - 'Mod 安装 - If {"jar", "litemod", "disabled", "old"}.Any(Function(t) t = Extension) Then - Log("[System] 文件为 jar/litemod 格式，尝试作为 Mod 安装") - '检查回收站：回收站中的文件有错误的文件名 - If FilePathList.First.Contains(":\$RECYCLE.BIN\") Then - Hint("请先将文件从回收站还原，再拖入 PCL！", HintType.Critical) - Exit Sub - End If - '获取并检查目标版本 - Dim TargetVersion As McVersion = McVersionCurrent - If PageCurrent = PageType.VersionSetup Then TargetVersion = PageVersionLeft.Version - If PageCurrent = PageType.VersionSelect OrElse TargetVersion Is Nothing OrElse Not TargetVersion.Modable Then - '正在选择版本，或当前版本不能安装 Mod - Hint("若要安装 Mod，请先选择一个可以安装 Mod 的版本！") - ElseIf Not (PageCurrent = PageType.VersionSetup AndAlso PageCurrentSub = PageSubType.VersionMod) Then - '未处于 Mod 管理页面 - If MyMsgBox($"是否要将这{If(FilePathList.Count = 1, "个", "些")}文件作为 Mod 安装到 {TargetVersion.Name}？", "Mod 安装确认", "确定", "取消") = 1 Then GoTo Install - Else - '处于 Mod 管理页面 -Install: - Try - For Each ModFile In FilePathList - Dim NewFileName = GetFileNameFromPath(ModFile).Replace(".disabled", "") - If Not NewFileName.Contains(".") Then NewFileName += ".jar" '#4227 - CopyFile(ModFile, TargetVersion.PathIndie & "mods\" & NewFileName) - Next - If FilePathList.Count = 1 Then - Hint($"已安装 {GetFileNameFromPath(FilePathList.First).Replace(".disabled", "")}！", HintType.Finish) - Else - Hint($"已安装 {FilePathList.Count} 个 Mod！", HintType.Finish) - End If - '刷新列表 - If PageCurrent = PageType.VersionSetup AndAlso PageCurrentSub = PageSubType.VersionMod Then - LoaderFolderRun(McModLoader, TargetVersion.PathIndie & "mods\", LoaderFolderRunType.ForceRun) - End If - Catch ex As Exception - Log(ex, "复制 Mod 文件失败", LogLevel.Msgbox) - End Try - End If - Exit Sub - End If + '安装 Mod + If PageVersionMod.InstallMods(FilePathList) Then Exit Sub '安装整合包 If {"zip", "rar", "mrpack"}.Any(Function(t) t = Extension) Then '部分压缩包是 zip 格式但后缀为 rar，总之试一试 Log("[System] 文件为压缩包，尝试作为整合包安装") @@ -1063,9 +1029,6 @@ Install: Case PageType.Download If FrmDownloadLeft Is Nothing Then FrmDownloadLeft = New PageDownloadLeft Return FrmDownloadLeft.PageID - Case PageType.Link - If FrmLinkLeft Is Nothing Then FrmLinkLeft = New PageLinkLeft - Return FrmLinkLeft.PageID Case PageType.Setup If FrmSetupLeft Is Nothing Then FrmSetupLeft = New PageSetupLeft Return FrmSetupLeft.PageID @@ -1134,9 +1097,6 @@ Install: CType(PanTitleSelect.Children(Stack), MyRadioButton).SetChecked(True, True, PageNameGet(PageCurrent) = "") IsChangingPage = False Select Case Stack.Page - Case PageType.Link - If FrmLinkLeft Is Nothing Then FrmLinkLeft = New PageLinkLeft - CType(FrmLinkLeft.PanItem.Children(SubType), MyListItem).SetChecked(True, True, Stack = PageCurrent) Case PageType.Download If FrmDownloadLeft Is Nothing Then FrmDownloadLeft = New PageDownloadLeft CType(FrmDownloadLeft.PanItem.Children(SubType), MyListItem).SetChecked(True, True, Stack = PageCurrent) @@ -1165,14 +1125,6 @@ Install: If IsChangingPage Then Exit Sub PageChangeActual(Val(sender.Tag)) End Sub - Private Sub CancelLink(sender As Object, e As RouteEventArgs) Handles BtnTitleSelect2.PreviewClick - If MyMsgBox("由于联机提供商要求新联机强制付费，且高度商业化，PCL 将暂时关闭联机功能，不再使用该联机模块。" & vbCrLf & - "PCL、HMCL、BakaXL 将合作开发新的跨启动器联机功能，在开发结束后将同步开放，请各位多多理解。", - "联机功能已暂时关闭", "查看详情", "确定") = 1 Then - OpenWebsite("https://www.bilibili.com/read/cv19845645") - End If - e.Handled = True - End Sub ''' ''' 通过点击返回按钮或手动触发返回来改变页面。 ''' @@ -1203,9 +1155,9 @@ Install: If PageStack.Any Then '子页面 → 另一个子页面，更新 AniStart({ - AaOpacity(LabTitleInner, -LabTitleInner.Opacity, 130), - AaCode(Sub() LabTitleInner.Text = PageName,, True), - AaOpacity(LabTitleInner, 1, 150, 30) + AaOpacity(LabTitleInner, -LabTitleInner.Opacity, 130), + AaCode(Sub() LabTitleInner.Text = PageName,, True), + AaOpacity(LabTitleInner, 1, 150, 30) }, "FrmMain Titlebar SubLayer") If PageStack.Contains(Stack) Then '返回到更上层的子页面 @@ -1299,37 +1251,41 @@ Install: AniControlEnabled -= 1 '执行动画 AniStart({ - AaCode(Sub() - AniControlEnabled += 1 - '把新页面添加进容器 - PanMainLeft.Child = PageLeft - PageLeft.Opacity = 0 - PanMainLeft.Background = Nothing - AniControlEnabled -= 1 - RunInUi(Sub() PanMainLeft_Resize(PanMainLeft.ActualWidth), True) - End Sub, 130), - AaCode(Sub() - '延迟触发页面通用动画，以使得在 Loaded 事件中加载的控件得以处理 - PageLeft.Opacity = 1 - PageLeft.TriggerShowAnimation() - End Sub, 30, True) + AaCode( + Sub() + AniControlEnabled += 1 + '把新页面添加进容器 + PanMainLeft.Child = PageLeft + PageLeft.Opacity = 0 + PanMainLeft.Background = Nothing + AniControlEnabled -= 1 + RunInUi(Sub() PanMainLeft_Resize(PanMainLeft.ActualWidth), True) + End Sub, 130), + AaCode( + Sub() + '延迟触发页面通用动画，以使得在 Loaded 事件中加载的控件得以处理 + PageLeft.Opacity = 1 + PageLeft.TriggerShowAnimation() + End Sub, 30, True) }, "FrmMain PageChangeLeft") AniStart({ - AaCode(Sub() - AniControlEnabled += 1 - CType(PanMainRight.Child, MyPageRight).PageOnForceExit() - '把新页面添加进容器 - PanMainRight.Child = PageRight - PageRight.Opacity = 0 - PanMainRight.Background = Nothing - AniControlEnabled -= 1 - RunInUi(Sub() BtnExtraBack.ShowRefresh(), True) - End Sub, 130), - AaCode(Sub() - '延迟触发页面通用动画，以使得在 Loaded 事件中加载的控件得以处理 - PageRight.Opacity = 1 - PageRight.PageOnEnter() - End Sub, 30, True) + AaCode( + Sub() + AniControlEnabled += 1 + CType(PanMainRight.Child, MyPageRight).PageOnForceExit() + '把新页面添加进容器 + PanMainRight.Child = PageRight + PageRight.Opacity = 0 + PanMainRight.Background = Nothing + AniControlEnabled -= 1 + RunInUi(Sub() BtnExtraBack.ShowRefresh(), True) + End Sub, 130), + AaCode( + Sub() + '延迟触发页面通用动画，以使得在 Loaded 事件中加载的控件得以处理 + PageRight.Opacity = 1 + PageRight.PageOnEnter() + End Sub, 30, True) }, "FrmMain PageChangeRight") End Sub ''' @@ -1342,12 +1298,12 @@ Install: PanTitleMain.IsHitTestVisible = True PanTitleInner.IsHitTestVisible = False AniStart({ - AaOpacity(PanTitleInner, -PanTitleInner.Opacity, 150), - AaX(PanTitleInner, -18 - PanTitleInner.Margin.Left, 150,, New AniEaseInFluent), - AaOpacity(PanTitleMain, 1 - PanTitleMain.Opacity, 150, 200), - AaX(PanTitleMain, -PanTitleMain.Margin.Left, 350, 200, New AniEaseOutBack(AniEasePower.Weak)), - AaCode(Sub() PanTitleInner.Visibility = Visibility.Collapsed,, True) - }, "FrmMain Titlebar FirstLayer") + AaOpacity(PanTitleInner, -PanTitleInner.Opacity, 150), + AaX(PanTitleInner, -18 - PanTitleInner.Margin.Left, 150,, New AniEaseInFluent), + AaOpacity(PanTitleMain, 1 - PanTitleMain.Opacity, 150, 200), + AaX(PanTitleMain, -PanTitleMain.Margin.Left, 350, 200, New AniEaseOutBack(AniEasePower.Weak)), + AaCode(Sub() PanTitleInner.Visibility = Visibility.Collapsed,, True) + }, "FrmMain Titlebar FirstLayer") PageStack.Clear() Else '主页面 → 主页面，无事发生 @@ -1366,16 +1322,16 @@ Install: If NewWidth > 0 Then '宽度足够，显示 AniStart({ - AaWidth(RectLeftBackground, NewWidth - RectLeftBackground.Width, 400,, New AniEaseOutFluent(AniEasePower.ExtraStrong)), - AaOpacity(RectLeftShadow, 1 - RectLeftShadow.Opacity, 200), - AaCode(Sub() PanMainLeft.IsHitTestVisible = True, 250) + AaWidth(RectLeftBackground, NewWidth - RectLeftBackground.Width, 400,, New AniEaseOutFluent(AniEasePower.ExtraStrong)), + AaOpacity(RectLeftShadow, 1 - RectLeftShadow.Opacity, 200), + AaCode(Sub() PanMainLeft.IsHitTestVisible = True, 250) }, "FrmMain LeftChange", True) Else '宽度不足，隐藏 AniStart({ - AaWidth(RectLeftBackground, -RectLeftBackground.Width, 200,, New AniEaseOutFluent), - AaOpacity(RectLeftShadow, -RectLeftShadow.Opacity, 200), - AaCode(Sub() PanMainLeft.IsHitTestVisible = True, 170) + AaWidth(RectLeftBackground, -RectLeftBackground.Width, 200,, New AniEaseOutFluent), + AaOpacity(RectLeftShadow, -RectLeftShadow.Opacity, 200), + AaCode(Sub() PanMainLeft.IsHitTestVisible = True, 170) }, "FrmMain LeftChange", True) End If Else diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb index 83f8d6c..6155e63 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModBase.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModBase.vb @@ -12,13 +12,13 @@ Public Module ModBase #Region "声明" '下列版本信息由更新器自动修改 - Public Const VersionBaseName As String = "2.8.10" '不含分支前缀的显示用版本名 - Public Const VersionStandardCode As String = "2.8.10." & VersionBranchCode '标准格式的四段式版本号 + Public Const VersionBaseName As String = "2.8.11" '不含分支前缀的显示用版本名 + Public Const VersionStandardCode As String = "2.8.11." & VersionBranchCode '标准格式的四段式版本号 Public Const CommitHash As String = "" 'Commit Hash，由 GitHub Workflow 自动替换 #If BETA Then Public Const VersionCode As Integer = 342 'Release #Else - Public Const VersionCode As Integer = 343 'Snapshot + Public Const VersionCode As Integer = 344 'Snapshot #End If '自动生成的版本信息 Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName @@ -971,7 +971,7 @@ Public Module ModBase End Using End Function ''' - ''' 弹出选取文件对话框并且要求选取文件。 + ''' 弹出选取文件对话框，要求选择一个文件。 ''' ''' 要求的格式。如：“常用图片文件(*.png;*.jpg)|*.png;*.jpg”。 ''' 弹窗的标题。 @@ -985,12 +985,32 @@ Public Module ModBase fileDialog.Title = Title fileDialog.ValidateNames = True fileDialog.ShowDialog() - SelectFile = fileDialog.FileName - Log("[UI] 选择文件返回：" & SelectFile) + Log("[UI] 选择单个文件返回：" & fileDialog.FileName) + Return fileDialog.FileName End Using End Function ''' - ''' 弹出选取文件夹对话框并且要求选取文件夹，以 \ 结尾。如果没有选择就返回空字符串。 + ''' 弹出选取文件对话框，要求选择多个文件。 + ''' + ''' 要求的格式。如：“常用图片文件(*.png;*.jpg)|*.png;*.jpg”。 + ''' 弹窗的标题。 + Public Function SelectFiles(FileFilter As String, Title As String) As String() + Using fileDialog As New Forms.OpenFileDialog + fileDialog.AddExtension = True + fileDialog.AutoUpgradeEnabled = True + fileDialog.CheckFileExists = True + fileDialog.Filter = FileFilter + fileDialog.Multiselect = True + fileDialog.Title = Title + fileDialog.ValidateNames = True + fileDialog.ShowDialog() + Log("[UI] 选择多个文件返回：" & fileDialog.FileNames.Join(",")) + Return fileDialog.FileNames + End Using + End Function + ''' + ''' 弹出选取文件夹对话框，要求选取文件夹。 + ''' 返回以 \ 结尾的完整路径，如果没有选择则返回空字符串。 ''' Public Function SelectFolder(Optional Title As String = "选择文件夹") As String Dim folderDialog As New Ookii.Dialogs.Wpf.VistaFolderBrowserDialog With {.ShowNewFolderButton = True, .RootFolder = Environment.SpecialFolder.Desktop, .Description = Title, .UseDescriptionForTitle = True} @@ -1880,6 +1900,8 @@ RetryDir: ''' Public Class SafeList(Of T) Inherits SynchronizedCollection(Of T) + Implements IEnumerable, IEnumerable(Of T) + '构造函数 Public Sub New() MyBase.New() End Sub @@ -1892,7 +1914,13 @@ RetryDir: Public Shared Widening Operator CType(Data As SafeList(Of T)) As List(Of T) Return New List(Of T)(Data) End Operator - Public Overloads Function GetEnumerator() As IEnumerator(Of T) + '基于 SyncLock 覆写 + Public Overloads Function GetEnumerator() As IEnumerator(Of T) Implements IEnumerable(Of T).GetEnumerator + SyncLock SyncRoot + Return Items.ToList.GetEnumerator() + End SyncLock + End Function + Private Overloads Function GetEnumeratorGeneral() As IEnumerator Implements IEnumerable.GetEnumerator SyncLock SyncRoot Return Items.ToList.GetEnumerator() End SyncLock @@ -2048,7 +2076,7 @@ NextElement: GetTimeSpanString = TotalMonthes & " 个月" ElseIf TotalMonthes >= 1 Then '1~4 月，“2 个月 13 天” - GetTimeSpanString = TotalMonthes & " 个月" & If((Span.Days Mod 30) > 0, " " & (Span.Days Mod 30) & " 天", "") + GetTimeSpanString = TotalMonthes & " 月" & If((Span.Days Mod 30) > 0, " " & (Span.Days Mod 30) & " 天", "") ElseIf Span.TotalDays >= 4 Then '4~30 天，“23 天” GetTimeSpanString = Span.Days & " 天" diff --git a/Plain Craft Launcher 2/Modules/Base/ModNet.vb b/Plain Craft Launcher 2/Modules/Base/ModNet.vb index 9dc6705..f046d34 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModNet.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModNet.vb @@ -930,7 +930,7 @@ RequestFinished: '条件检测 If NetTaskThreadCount >= NetTaskThreadLimit OrElse IsSourceFailed() OrElse - (IsNoSplit AndAlso Threads IsNot Nothing AndAlso Threads.State <> NetState.Error) Then Return Nothing + (IsNoSplit AndAlso Threads IsNot Nothing AndAlso Threads.State <> NetState.Error) Then Return Nothing If State >= NetState.Merge OrElse State = NetState.WaitForCheck Then Return Nothing SyncLock LockState If State < NetState.Connect Then State = NetState.Connect diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb index 97e7bde..36cc7ee 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb @@ -458,14 +458,14 @@ If StartVersion = EndVersion Then SpaVersions.Add("1." & StartVersion) ElseIf McVersionHighest > -1 AndAlso StartVersion >= McVersionHighest Then - If EndVersion <= 10 Then + If EndVersion < 10 Then SpaVersions.Clear() SpaVersions.Add("全版本") Exit For Else SpaVersions.Add("1." & EndVersion & "+") End If - ElseIf EndVersion <= 10 Then + ElseIf EndVersion < 10 Then SpaVersions.Add("1." & StartVersion & "-") Exit For ElseIf StartVersion - EndVersion = 1 Then @@ -478,25 +478,31 @@ End If '获取 Mod 加载器描述 Dim ModLoaderDescriptionFull As String, ModLoaderDescriptionPart As String - Select Case ModLoaders.Count + Dim ModLoadersForDesc As New List(Of CompModLoaderType)(ModLoaders) + If Setup.Get("ToolDownloadIgnoreQuilt") Then ModLoadersForDesc.Remove(CompModLoaderType.Quilt) + Select Case ModLoadersForDesc.Count Case 0 - ModLoaderDescriptionFull = "未知" - ModLoaderDescriptionPart = "" + If ModLoaders.Count = 1 Then + ModLoaderDescriptionFull = "仅 " & ModLoaders.Single.ToString + ModLoaderDescriptionPart = ModLoaders.Single.ToString + Else + ModLoaderDescriptionFull = "未知" + ModLoaderDescriptionPart = "" + End If Case 1 - ModLoaderDescriptionFull = "仅 " & ModLoaders.Single.ToString - ModLoaderDescriptionPart = ModLoaders.Single.ToString - Case 2, 3 - If Setup.Get("ToolDownloadIgnoreQuilt") AndAlso - ModLoaders.Contains(CompModLoaderType.Forge) AndAlso ModLoaders.Contains(CompModLoaderType.Fabric) Then + ModLoaderDescriptionFull = "仅 " & ModLoadersForDesc.Single.ToString + ModLoaderDescriptionPart = ModLoadersForDesc.Single.ToString + Case Else + If ModLoaders.Contains(CompModLoaderType.Forge) AndAlso + (GameVersions.Max < 14 OrElse ModLoaders.Contains(CompModLoaderType.Fabric)) AndAlso + (GameVersions.Max < 20 OrElse ModLoaders.Contains(CompModLoaderType.NeoForge)) AndAlso + (GameVersions.Max < 14 OrElse ModLoaders.Contains(CompModLoaderType.Quilt) OrElse Setup.Get("ToolDownloadIgnoreQuilt")) Then ModLoaderDescriptionFull = "任意" ModLoaderDescriptionPart = "" Else - ModLoaderDescriptionFull = ModLoaders.Join(" / ") - ModLoaderDescriptionPart = ModLoaders.Join(" / ") + ModLoaderDescriptionFull = ModLoadersForDesc.Join(" / ") + ModLoaderDescriptionPart = ModLoadersForDesc.Join(" / ") End If - Case Else - ModLoaderDescriptionFull = "任意" - ModLoaderDescriptionPart = "" End Select '实例化 UI Dim NewItem As New MyCompItem With {.Tag = Me, .Logo = GetControlLogo()} @@ -1156,7 +1162,7 @@ Retry: ''' Public ReadOnly ModLoaders As List(Of CompModLoaderType) ''' - ''' 支持的游戏版本列表。类型包括："1.18.5"，"1.18"，"1.18 快照"，"21w15a"，"未知版本"。 + ''' 支持的游戏版本列表。类型包括："1.18.5"，"1.18"，"1.18 预览版"，"21w15a"，"未知版本"。 ''' Public ReadOnly GameVersions As List(Of String) ''' @@ -1272,7 +1278,7 @@ Retry: End If 'GameVersions Dim RawVersions As List(Of String) = Data("gameVersions").Select(Function(t) t.ToString.Trim.ToLower).ToList - GameVersions = RawVersions.Where(Function(v) v.StartsWithF("1.")).Select(Function(v) v.Replace("-snapshot", " 快照")).ToList + GameVersions = RawVersions.Where(Function(v) v.StartsWithF("1.")).Select(Function(v) v.Replace("-snapshot", " 预览版")).ToList If GameVersions.Count > 1 Then GameVersions = Sort(GameVersions, AddressOf VersionSortBoolean).ToList If Type = CompType.ModPack Then GameVersions = New List(Of String) From {GameVersions(0)} @@ -1313,7 +1319,7 @@ Retry: 'GameVersions Dim RawVersions As List(Of String) = Data("game_versions").Select(Function(t) t.ToString.Trim.ToLower).ToList GameVersions = RawVersions.Where(Function(v) v.StartsWithF("1.") OrElse v.StartsWithF("b1.")). - Select(Function(v) If(v.Contains("-"), v.BeforeFirst("-") & " 快照", If(v.StartsWithF("b1."), "远古版本", v))).ToList + Select(Function(v) If(v.Contains("-"), v.BeforeFirst("-") & " 预览版", If(v.StartsWithF("b1."), "远古版本", v))).ToList If GameVersions.Count > 1 Then GameVersions = Sort(GameVersions, AddressOf VersionSortBoolean).ToList If Type = CompType.ModPack Then GameVersions = New List(Of String) From {GameVersions(0)} @@ -1420,14 +1426,12 @@ Retry: ''' ''' 已知文件信息的缓存。 ''' - Private CompFilesCache As New Dictionary(Of String, List(Of CompFile)) + Public CompFilesCache As New Dictionary(Of String, List(Of CompFile)) ''' ''' 获取某个工程下的全部文件列表。 ''' 必须在工作线程执行，失败会抛出异常。 ''' Public Function CompFilesGet(ProjectId As String, FromCurseForge As Boolean) As List(Of CompFile) - '使用缓存 - If CompFilesCache.ContainsKey(ProjectId) Then Return CompFilesCache(ProjectId) '获取工程对象 Dim TargetProject As CompProject If CompProjectCache.ContainsKey(ProjectId) Then '存在缓存 @@ -1438,25 +1442,26 @@ Retry: TargetProject = New CompProject(DlModRequest("https://api.modrinth.com/v2/project/" & ProjectId, IsJson:=True)) End If '获取工程对象的文件列表 - Log("[Comp] 开始获取文件列表：" & ProjectId) - Dim ResultJsonArray As JArray - If FromCurseForge Then - 'CurseForge - If TargetProject.Type = CompType.Mod Then 'Mod 使用每个版本最新的文件 - ResultJsonArray = GetJson(DlModRequest("https://api.curseforge.com/v1/mods/files", "POST", "{""fileIds"": [" & Join(TargetProject.CurseForgeFileIds, ",") & "]}", "application/json"))("data") - Else '否则使用全部文件 - ResultJsonArray = DlModRequest($"https://api.curseforge.com/v1/mods/{ProjectId}/files?pageSize=999", IsJson:=True)("data") + If Not CompFilesCache.ContainsKey(ProjectId) Then '有缓存也不能直接返回，这时候前置 Mod 可能没获取（#5173） + Log("[Comp] 开始获取文件列表：" & ProjectId) + Dim ResultJsonArray As JArray + If FromCurseForge Then + 'CurseForge + If TargetProject.Type = CompType.Mod Then 'Mod 使用每个版本最新的文件 + ResultJsonArray = GetJson(DlModRequest("https://api.curseforge.com/v1/mods/files", "POST", "{""fileIds"": [" & Join(TargetProject.CurseForgeFileIds, ",") & "]}", "application/json"))("data") + Else '否则使用全部文件 + ResultJsonArray = DlModRequest($"https://api.curseforge.com/v1/mods/{ProjectId}/files?pageSize=999", IsJson:=True)("data") + End If + Else + 'Modrinth + ResultJsonArray = DlModRequest($"https://api.modrinth.com/v2/project/{ProjectId}/version", IsJson:=True) End If - Else - 'Modrinth - ResultJsonArray = DlModRequest($"https://api.modrinth.com/v2/project/{ProjectId}/version", IsJson:=True) + CompFilesCache(ProjectId) = ResultJsonArray.Select(Function(a) New CompFile(a, TargetProject.Type)). + Where(Function(a) a.Available).ToList.Distinct(Function(a, b) a.Id = b.Id) 'CurseForge 可能会重复返回相同项（#1330） End If - CompFilesCache(ProjectId) = ResultJsonArray.Select(Function(a) New CompFile(a, TargetProject.Type)). - Where(Function(a) a.Available).ToList.Distinct(Function(a, b) a.Id = b.Id) 'CurseForge 可能会重复返回相同项（#1330） '获取前置 Mod 列表 If TargetProject.Type <> CompType.Mod Then Return CompFilesCache(ProjectId) - Dim Deps As List(Of String) = CompFilesCache(ProjectId). - SelectMany(Function(f) f.RawDependencies).Distinct().ToList + Dim Deps As List(Of String) = CompFilesCache(ProjectId).SelectMany(Function(f) f.RawDependencies).Distinct().ToList Dim UndoneDeps = Deps.Where(Function(f) Not CompProjectCache.ContainsKey(f)).ToList '获取前置 Mod 工程信息 If UndoneDeps.Any Then diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb index 832b372..81c1a66 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb @@ -167,24 +167,25 @@ End Structure ''' ''' Minecraft 客户端 版本列表，主加载器。 + ''' 若要求镜像源必须包含某个版本，则将该版本 ID 作为输入（#5195）。 ''' - Public DlClientListLoader As New LoaderTask(Of Integer, DlClientListResult)("DlClientList Main", AddressOf DlClientListMain) - Private Sub DlClientListMain(Loader As LoaderTask(Of Integer, DlClientListResult)) + Public DlClientListLoader As New LoaderTask(Of String, DlClientListResult)("DlClientList Main", AddressOf DlClientListMain) + Private Sub DlClientListMain(Loader As LoaderTask(Of String, DlClientListResult)) Select Case Setup.Get("ToolDownloadVersion") Case 0 - DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlClientListResult), Integer)) From { - New KeyValuePair(Of LoaderTask(Of Integer, DlClientListResult), Integer)(DlClientListBmclapiLoader, 30), - New KeyValuePair(Of LoaderTask(Of Integer, DlClientListResult), Integer)(DlClientListMojangLoader, 60) + DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of String, DlClientListResult), Integer)) From { + New KeyValuePair(Of LoaderTask(Of String, DlClientListResult), Integer)(DlClientListBmclapiLoader, 30), + New KeyValuePair(Of LoaderTask(Of String, DlClientListResult), Integer)(DlClientListMojangLoader, 30 + 60) }, Loader.IsForceRestarting) Case 1 - DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlClientListResult), Integer)) From { - New KeyValuePair(Of LoaderTask(Of Integer, DlClientListResult), Integer)(DlClientListMojangLoader, 5), - New KeyValuePair(Of LoaderTask(Of Integer, DlClientListResult), Integer)(DlClientListBmclapiLoader, 35) + DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of String, DlClientListResult), Integer)) From { + New KeyValuePair(Of LoaderTask(Of String, DlClientListResult), Integer)(DlClientListMojangLoader, 5), + New KeyValuePair(Of LoaderTask(Of String, DlClientListResult), Integer)(DlClientListBmclapiLoader, 5 + 30) }, Loader.IsForceRestarting) Case Else - DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlClientListResult), Integer)) From { - New KeyValuePair(Of LoaderTask(Of Integer, DlClientListResult), Integer)(DlClientListMojangLoader, 60), - New KeyValuePair(Of LoaderTask(Of Integer, DlClientListResult), Integer)(DlClientListBmclapiLoader, 60) + DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of String, DlClientListResult), Integer)) From { + New KeyValuePair(Of LoaderTask(Of String, DlClientListResult), Integer)(DlClientListMojangLoader, 60), + New KeyValuePair(Of LoaderTask(Of String, DlClientListResult), Integer)(DlClientListBmclapiLoader, 60 + 60) }, Loader.IsForceRestarting) End Select End Sub @@ -193,9 +194,9 @@ ''' ''' Minecraft 客户端 版本列表，Mojang 官方源加载器。 ''' - Public DlClientListMojangLoader As New LoaderTask(Of Integer, DlClientListResult)("DlClientList Mojang", AddressOf DlClientListMojangMain) + Public DlClientListMojangLoader As New LoaderTask(Of String, DlClientListResult)("DlClientList Mojang", AddressOf DlClientListMojangMain) Private IsNewClientVersionHinted As Boolean = False - Private Sub DlClientListMojangMain(Loader As LoaderTask(Of Integer, DlClientListResult)) + Private Sub DlClientListMojangMain(Loader As LoaderTask(Of String, DlClientListResult)) Dim Json As JObject = NetGetCodeByRequestRetry("https://launchermeta.mojang.com/mc/game/version_manifest.json", IsJson:=True) Try Dim Versions As JArray = Json("versions") @@ -225,14 +226,21 @@ ''' ''' Minecraft 客户端 版本列表，BMCLAPI 源加载器。 ''' - Public DlClientListBmclapiLoader As New LoaderTask(Of Integer, DlClientListResult)("DlClientList Bmclapi", AddressOf DlClientListBmclapiMain) - Private Sub DlClientListBmclapiMain(Loader As LoaderTask(Of Integer, DlClientListResult)) + Public DlClientListBmclapiLoader As New LoaderTask(Of String, DlClientListResult)("DlClientList Bmclapi", AddressOf DlClientListBmclapiMain) + Private Sub DlClientListBmclapiMain(Loader As LoaderTask(Of String, DlClientListResult)) Dim Json As JObject = NetGetCodeByRequestRetry("https://bmclapi2.bangbang93.com/mc/game/version_manifest.json", IsJson:=True) Try Dim Versions As JArray = Json("versions") If Versions.Count < 200 Then Throw New Exception("获取到的版本列表长度不足（" & Json.ToString & "）") '添加 PCL 特供项 If File.Exists(PathTemp & "Cache\download.json") Then Versions.Merge(GetJson(ReadFile(PathTemp & "Cache\download.json"))) + '检查是否有要求的版本（#5195） + If Not String.IsNullOrEmpty(Loader.Input) Then + Dim Id = Loader.Input + If Not DlClientListLoader.Output.Value("versions").Any(Function(v) v("id") = Id) Then + Throw New Exception("BMCLAPI 源未包含目标版本 " & Id) + End If + End If '返回 Loader.Output = New DlClientListResult With {.IsOfficial = False, .SourceName = "BMCLAPI", .Value = Json} Catch ex As Exception @@ -245,26 +253,31 @@ ''' Public Function DlClientListGet(Id As String) Try - '确认 Minecraft 版本列表已完成获取 - Select Case DlClientListLoader.State - Case LoadState.Loading - DlClientListLoader.WaitForExit() - Case LoadState.Failed, LoadState.Aborted, LoadState.Waiting - DlClientListLoader.WaitForExit(IsForceRestart:=True) - End Select '确认版本格式标准 Id = Id.Replace("_", "-") '1.7.10_pre4 在版本列表中显示为 1.7.10-pre4 If Id <> "1.0" AndAlso Id.EndsWithF(".0") Then Id = Left(Id, Id.Length - 2) 'OptiFine 1.8 的下载会触发此问题，显示版本为 1.8.0 - '查找版本并开始 + '获取 Minecraft 版本列表 + Select Case DlClientListLoader.State + Case LoadState.Finished + '从当前的结果获取目标版本… + For Each Version As JObject In DlClientListLoader.Output.Value("versions") + If Version("id") = Id Then Return Version("url").ToString + Next + '…如果没有，则重新尝试获取（在版本刚更新时可能出现这种情况，#5195） + DlClientListLoader.WaitForExit(Id, IsForceRestart:=True) + Case LoadState.Loading + DlClientListLoader.WaitForExit(Id) + Case LoadState.Failed, LoadState.Aborted, LoadState.Waiting + DlClientListLoader.WaitForExit(Id, IsForceRestart:=True) + End Select + '重新查找版本 For Each Version As JObject In DlClientListLoader.Output.Value("versions") - If Version("id") = Id Then - Return Version("url").ToString - End If + If Version("id") = Id Then Return Version("url").ToString Next - Log("未发现版本 " & Id & " 的 json 下载地址，版本列表返回为：" & vbCrLf & DlClientListLoader.Output.Value.ToString, LogLevel.Debug) + Log($"未发现版本 {Id} 的 json 下载地址，版本列表返回为：{vbCrLf}{DlClientListLoader.Output.Value.ToString}", LogLevel.Debug) Return Nothing Catch ex As Exception - Log(ex, "获取版本 " & Id & " 的 json 下载地址失败") + Log(ex, $"获取版本 {Id} 的 json 下载地址失败") Return Nothing End Try End Function @@ -337,17 +350,17 @@ Case 0 DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlOptiFineListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlOptiFineListResult), Integer)(DlOptiFineListBmclapiLoader, 30), - New KeyValuePair(Of LoaderTask(Of Integer, DlOptiFineListResult), Integer)(DlOptiFineListOfficialLoader, 60) + New KeyValuePair(Of LoaderTask(Of Integer, DlOptiFineListResult), Integer)(DlOptiFineListOfficialLoader, 30 + 60) }, Loader.IsForceRestarting) Case 1 DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlOptiFineListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlOptiFineListResult), Integer)(DlOptiFineListOfficialLoader, 5), - New KeyValuePair(Of LoaderTask(Of Integer, DlOptiFineListResult), Integer)(DlOptiFineListBmclapiLoader, 35) + New KeyValuePair(Of LoaderTask(Of Integer, DlOptiFineListResult), Integer)(DlOptiFineListBmclapiLoader, 5 + 30) }, Loader.IsForceRestarting) Case Else DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlOptiFineListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlOptiFineListResult), Integer)(DlOptiFineListOfficialLoader, 60), - New KeyValuePair(Of LoaderTask(Of Integer, DlOptiFineListResult), Integer)(DlOptiFineListBmclapiLoader, 60) + New KeyValuePair(Of LoaderTask(Of Integer, DlOptiFineListResult), Integer)(DlOptiFineListBmclapiLoader, 60 + 60) }, Loader.IsForceRestarting) End Select End Sub @@ -443,17 +456,17 @@ Case 0 DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlForgeListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlForgeListResult), Integer)(DlForgeListBmclapiLoader, 30), - New KeyValuePair(Of LoaderTask(Of Integer, DlForgeListResult), Integer)(DlForgeListOfficialLoader, 60) + New KeyValuePair(Of LoaderTask(Of Integer, DlForgeListResult), Integer)(DlForgeListOfficialLoader, 30 + 60) }, Loader.IsForceRestarting) Case 1 DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlForgeListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlForgeListResult), Integer)(DlForgeListOfficialLoader, 5), - New KeyValuePair(Of LoaderTask(Of Integer, DlForgeListResult), Integer)(DlForgeListBmclapiLoader, 35) + New KeyValuePair(Of LoaderTask(Of Integer, DlForgeListResult), Integer)(DlForgeListBmclapiLoader, 5 + 30) }, Loader.IsForceRestarting) Case Else DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlForgeListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlForgeListResult), Integer)(DlForgeListOfficialLoader, 60), - New KeyValuePair(Of LoaderTask(Of Integer, DlForgeListResult), Integer)(DlForgeListBmclapiLoader, 60) + New KeyValuePair(Of LoaderTask(Of Integer, DlForgeListResult), Integer)(DlForgeListBmclapiLoader, 60 + 60) }, Loader.IsForceRestarting) End Select End Sub @@ -588,17 +601,17 @@ Case 0 DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of String, List(Of DlForgeVersionEntry)), Integer)) From { New KeyValuePair(Of LoaderTask(Of String, List(Of DlForgeVersionEntry)), Integer)(DlForgeVersionBmclapiLoader, 30), - New KeyValuePair(Of LoaderTask(Of String, List(Of DlForgeVersionEntry)), Integer)(DlForgeVersionOfficialLoader, 60) + New KeyValuePair(Of LoaderTask(Of String, List(Of DlForgeVersionEntry)), Integer)(DlForgeVersionOfficialLoader, 30 + 60) }, Loader.IsForceRestarting) Case 1 DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of String, List(Of DlForgeVersionEntry)), Integer)) From { New KeyValuePair(Of LoaderTask(Of String, List(Of DlForgeVersionEntry)), Integer)(DlForgeVersionOfficialLoader, 5), - New KeyValuePair(Of LoaderTask(Of String, List(Of DlForgeVersionEntry)), Integer)(DlForgeVersionBmclapiLoader, 35) + New KeyValuePair(Of LoaderTask(Of String, List(Of DlForgeVersionEntry)), Integer)(DlForgeVersionBmclapiLoader, 5 + 30) }, Loader.IsForceRestarting) Case Else DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of String, List(Of DlForgeVersionEntry)), Integer)) From { New KeyValuePair(Of LoaderTask(Of String, List(Of DlForgeVersionEntry)), Integer)(DlForgeVersionOfficialLoader, 60), - New KeyValuePair(Of LoaderTask(Of String, List(Of DlForgeVersionEntry)), Integer)(DlForgeVersionBmclapiLoader, 60) + New KeyValuePair(Of LoaderTask(Of String, List(Of DlForgeVersionEntry)), Integer)(DlForgeVersionBmclapiLoader, 60 + 60) }, Loader.IsForceRestarting) End Select End Sub @@ -795,17 +808,17 @@ Case 0 DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListBmclapiLoader, 30), - New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListOfficialLoader, 60) + New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListOfficialLoader, 30 + 60) }, Loader.IsForceRestarting) Case 1 DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListOfficialLoader, 5), - New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListBmclapiLoader, 35) + New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListBmclapiLoader, 5 + 30) }, Loader.IsForceRestarting) Case Else DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListOfficialLoader, 60), - New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListBmclapiLoader, 60) + New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListBmclapiLoader, 60 + 60) }, Loader.IsForceRestarting) End Select End Sub @@ -920,17 +933,17 @@ Case 0 DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlLiteLoaderListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlLiteLoaderListResult), Integer)(DlLiteLoaderListBmclapiLoader, 30), - New KeyValuePair(Of LoaderTask(Of Integer, DlLiteLoaderListResult), Integer)(DlLiteLoaderListOfficialLoader, 60) + New KeyValuePair(Of LoaderTask(Of Integer, DlLiteLoaderListResult), Integer)(DlLiteLoaderListOfficialLoader, 30 + 60) }, Loader.IsForceRestarting) Case 1 DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlLiteLoaderListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlLiteLoaderListResult), Integer)(DlLiteLoaderListOfficialLoader, 5), - New KeyValuePair(Of LoaderTask(Of Integer, DlLiteLoaderListResult), Integer)(DlLiteLoaderListBmclapiLoader, 35) + New KeyValuePair(Of LoaderTask(Of Integer, DlLiteLoaderListResult), Integer)(DlLiteLoaderListBmclapiLoader, 5 + 30) }, Loader.IsForceRestarting) Case Else DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlLiteLoaderListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlLiteLoaderListResult), Integer)(DlLiteLoaderListOfficialLoader, 60), - New KeyValuePair(Of LoaderTask(Of Integer, DlLiteLoaderListResult), Integer)(DlLiteLoaderListBmclapiLoader, 60) + New KeyValuePair(Of LoaderTask(Of Integer, DlLiteLoaderListResult), Integer)(DlLiteLoaderListBmclapiLoader, 60 + 60) }, Loader.IsForceRestarting) End Select End Sub @@ -1019,17 +1032,17 @@ Case 0 DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlFabricListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlFabricListResult), Integer)(DlFabricListBmclapiLoader, 30), - New KeyValuePair(Of LoaderTask(Of Integer, DlFabricListResult), Integer)(DlFabricListOfficialLoader, 60) + New KeyValuePair(Of LoaderTask(Of Integer, DlFabricListResult), Integer)(DlFabricListOfficialLoader, 30 + 60) }, Loader.IsForceRestarting) Case 1 DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlFabricListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlFabricListResult), Integer)(DlFabricListOfficialLoader, 5), - New KeyValuePair(Of LoaderTask(Of Integer, DlFabricListResult), Integer)(DlFabricListBmclapiLoader, 35) + New KeyValuePair(Of LoaderTask(Of Integer, DlFabricListResult), Integer)(DlFabricListBmclapiLoader, 5 + 30) }, Loader.IsForceRestarting) Case Else DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlFabricListResult), Integer)) From { New KeyValuePair(Of LoaderTask(Of Integer, DlFabricListResult), Integer)(DlFabricListOfficialLoader, 60), - New KeyValuePair(Of LoaderTask(Of Integer, DlFabricListResult), Integer)(DlFabricListBmclapiLoader, 60) + New KeyValuePair(Of LoaderTask(Of Integer, DlFabricListResult), Integer)(DlFabricListBmclapiLoader, 60 + 60) }, Loader.IsForceRestarting) End Select End Sub @@ -1235,71 +1248,63 @@ Optional IsForceRestart As Boolean = False) Dim WaitCycle As Integer = 0 Do While True - '检查加载结束 - Dim IsAllFailed As Boolean = True + '检查状态 + Dim BeforeLoadersAllFailed As Boolean = True For Each SubLoader In LoaderList - If WaitCycle = 0 Then - '如果要强制刷新，就不使用已经加载好的值 - If IsForceRestart Then Exit For - '如果输入不一样，就不使用已经加载好的值 + If WaitCycle = 0 Then '判断是否可以不加载，直接使用已经加载好的结果 + If IsForceRestart Then Continue For '强制刷新，不行 If (SubLoader.Key.Input Is Nothing Xor MainLoader.Input Is Nothing) OrElse - (SubLoader.Key.Input IsNot Nothing AndAlso Not SubLoader.Key.Input.Equals(MainLoader.Input)) Then Continue For + (SubLoader.Key.Input IsNot Nothing AndAlso Not SubLoader.Key.Input.Equals(MainLoader.Input)) Then Continue For '父子加载器的输入不一样，也不行 End If - If SubLoader.Key.State <> LoadState.Failed Then IsAllFailed = False + If SubLoader.Key.State <> LoadState.Failed Then BeforeLoadersAllFailed = False If SubLoader.Key.State = LoadState.Finished Then + '检查加载器成功 MainLoader.Output = SubLoader.Key.Output DlSourceLoaderAbort(LoaderList) Exit Sub - ElseIf IsAllFailed Then + ElseIf BeforeLoadersAllFailed Then + '此前的加载器全部失败，直接启动后续加载器 If WaitCycle < SubLoader.Value * 100 Then WaitCycle = SubLoader.Value * 100 End If - '由于 Forge BMCLAPI 没有可用版本导致强制失败 - '在没有可用版本时，官方源会一直卡住，直接使用 BMCLAPI 判定失败即可 - If SubLoader.Key.Error IsNot Nothing AndAlso SubLoader.Key.Error.Message.Contains("没有可用版本") Then - For Each SubLoader2 In LoaderList - If WaitCycle < SubLoader2.Value * 100 Then WaitCycle = SubLoader2.Value * 100 - Next - End If Next - '启动加载源 + '第一轮时：既然不直接使用已经加载好的结果，那就启动第一个加载器 If WaitCycle = 0 Then - '启动第一个源 - LoaderList(0).Key.Start(MainLoader.Input, IsForceRestart) - '将其他源标记为未启动，以确保可以切换下载源（#184） - For i = 1 To LoaderList.Count - 1 - LoaderList(i).Key.State = LoadState.Waiting + LoaderList.First.Key.Start(MainLoader.Input, IsForceRestart) + For Each Loader In LoaderList.Skip(1) + Loader.Key.State = LoadState.Waiting '将其他源标记为未启动，以确保可以切换下载源（#184） Next End If + '检查加载器失败或超时 For i = 0 To LoaderList.Count - 1 - If WaitCycle = LoaderList(i).Value * 100 Then - If i < LoaderList.Count - 1 Then - '启动下一个源 - LoaderList(i + 1).Key.Start(MainLoader.Input, IsForceRestart) - Else - '失败 - Dim ErrorInfo As Exception = Nothing - For ii = 0 To LoaderList.Count - 1 - LoaderList(ii).Key.Input = Nothing '重置输入，以免以同样的输入“重试加载”时直接失败 - If LoaderList(ii).Key.Error IsNot Nothing Then - If ErrorInfo Is Nothing OrElse LoaderList(ii).Key.Error.Message.Contains("没有可用版本") Then - ErrorInfo = LoaderList(ii).Key.Error - End If + If WaitCycle <> LoaderList(i).Value * 100 Then Continue For + If i < LoaderList.Count - 1 AndAlso Not LoaderList.All(Function(l) l.Key.State = LoadState.Failed) Then + '若还有下一个源，则启动下一个源 + LoaderList(i + 1).Key.Start(MainLoader.Input, IsForceRestart) + Else + '若没有，则失败 + Dim ErrorInfo As Exception = Nothing + For ii = 0 To LoaderList.Count - 1 + LoaderList(ii).Key.Input = Nothing '重置输入，以免以同样的输入“重试加载”时直接失败 + If LoaderList(ii).Key.Error IsNot Nothing Then + If ErrorInfo Is Nothing OrElse LoaderList(ii).Key.Error.Message.Contains("没有可用版本") Then + ErrorInfo = LoaderList(ii).Key.Error End If - Next - If ErrorInfo Is Nothing Then ErrorInfo = New TimeoutException("下载源连接超时") - DlSourceLoaderAbort(LoaderList) - Throw ErrorInfo - End If - Exit For + End If + Next + If ErrorInfo Is Nothing Then ErrorInfo = New TimeoutException("下载源连接超时") + DlSourceLoaderAbort(LoaderList) + Throw ErrorInfo End If + Exit For Next '计时 + Thread.Sleep(10) + WaitCycle += 1 + '检查父加载器中断 If MainLoader.IsAborted Then DlSourceLoaderAbort(LoaderList) Exit Sub End If - Thread.Sleep(10) - WaitCycle += 1 Loop End Sub Private Sub DlSourceLoaderAbort(Of InputType, OutputType)(LoaderList As List(Of KeyValuePair(Of LoaderTask(Of InputType, OutputType), Integer))) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb index 1eee00a..d11075e 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb @@ -489,16 +489,18 @@ NoUserJava: Public JavaSearchLoader As New LoaderTask(Of Integer, Integer)("查找 Java", AddressOf JavaSearchLoaderSub) With {.ProgressWeight = 2} Private Sub JavaSearchLoaderSub(Loader As LoaderTask(Of Integer, Integer)) If FrmSetupLaunch IsNot Nothing Then - RunInUiWait(Sub() - FrmSetupLaunch.ComboArgumentJava.Items.Clear() - FrmSetupLaunch.ComboArgumentJava.Items.Add(New ComboBoxItem With {.Content = "加载中……", .IsSelected = True}) - End Sub) + RunInUiWait( + Sub() + FrmSetupLaunch.ComboArgumentJava.Items.Clear() + FrmSetupLaunch.ComboArgumentJava.Items.Add(New ComboBoxItem With {.Content = "加载中……", .IsSelected = True}) + End Sub) End If If FrmVersionSetup IsNot Nothing Then - RunInUiWait(Sub() - FrmVersionSetup.ComboArgumentJava.Items.Clear() - FrmVersionSetup.ComboArgumentJava.Items.Add(New ComboBoxItem With {.Content = "加载中……", .IsSelected = True}) - End Sub) + RunInUiWait( + Sub() + FrmVersionSetup.ComboArgumentJava.Items.Clear() + FrmVersionSetup.ComboArgumentJava.Items.Add(New ComboBoxItem With {.Content = "加载中……", .IsSelected = True}) + End Sub) End If Try @@ -520,6 +522,7 @@ NoUserJava: Next '查找磁盘中的 Java For Each Disk As DriveInfo In DriveInfo.GetDrives() + If Disk.DriveType = DriveType.Network Then Continue For '跳过网络驱动器（#3705） JavaSearchFolder(Disk.Name, JavaPreList, False) Next '查找 APPDATA 文件夹中的 Java diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb index ecf4dcc..62e457f 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb @@ -225,9 +225,9 @@ NextInner: Select Case Setup.Get("SystemLaunchCount") Case 10, 20, 40, 60, 80, 100, 120, 150, 200, 250, 300, 350, 400, 500, 600, 700, 800, 900, 1000, 1200, 1400, 1600, 1800, 2000 If MyMsgBox("PCL 已经为你启动了 " & Setup.Get("SystemLaunchCount") & " 次游戏啦！" & vbCrLf & - "如果觉得 PCL 还算好用的话，也可以考虑赞助一下作者……一点心意也行……" & vbCrLf & - "毕竟一个人开发也不容易（悲）……", - "求赞助啦……", "这就赞助！", "但是我拒绝") = 1 Then + "如果 PCL 还算好用的话，能不能考虑赞助一下 PCL……" & vbCrLf & + "如果没有大家的支持，PCL 很难在免费、无任何广告的情况下维持数年的更新（磕头）……！", + Setup.Get("SystemLaunchCount") & " 次启动！", "支持 PCL！", "但是我拒绝") = 1 Then OpenWebsite("https://afdian.com/a/LTCat") End If End Select @@ -237,10 +237,10 @@ NextInner: If Not Setup.Get("HintBuy") AndAlso Setup.Get("LoginType") <> McLoginType.Ms Then If IsSystemLanguageChinese() Then Select Case Setup.Get("SystemLaunchCount") - Case 2, 5, 10, 15, 20, 40, 60, 80, 100, 125, 150, 175, 200, 250, 300, 350, 400, 500, 600, 700, 800, 900, 1000, 1200, 1400, 1600, 1800, 2000 + Case 3, 8, 15, 30, 50, 70, 90, 110, 130, 180, 220, 280, 330, 380, 450, 550, 660, 750, 880, 950, 1100, 1300, 1500, 1700, 1900 If MyMsgBox("你已经启动了 " & Setup.Get("SystemLaunchCount") & " 次 Minecraft 啦！" & vbCrLf & - "如果觉得 Minecraft 还不错，可以购买正版支持一下，毕竟开发游戏也真的很不容易……" & vbCrLf & vbCrLf & - "在你登录一次正版账号后，就不会再出现这个提示了！", + "如果觉得 Minecraft 还不错，可以购买正版支持一下，毕竟开发游戏也真的很不容易……不要一直白嫖啦。" & vbCrLf & vbCrLf & + "在登录一次正版账号后，就不会再出现这个提示了！", "考虑一下正版？", "支持正版游戏！", "下次一定") = 1 Then OpenWebsite("https://www.xbox.com/zh-cn/games/store/minecraft-java-bedrock-edition-for-pc/9nxp44l49shj") End If @@ -805,7 +805,19 @@ LoginFinish: ErrorMessage = GetJson(DirectCast(ex, ResponsedWebException).Response)("errorMessage") Catch End Try - If Not String.IsNullOrWhiteSpace(ErrorMessage) Then Throw New Exception("$登录失败：" & ErrorMessage) + If Not String.IsNullOrWhiteSpace(ErrorMessage) Then + If ErrorMessage.Contains("密码错误") OrElse ErrorMessage.ContainsF("Incorrect username or password", True) Then + '密码错误，退出登录 (#5090) + McLaunchLog("密码错误，退出登录") + Select Case Data.Input.Type + Case McLoginType.Auth + RunInUi(AddressOf PageLoginAuthSkin.ExitLogin) + Case McLoginType.Nide + RunInUi(AddressOf PageLoginNideSkin.ExitLogin) + End Select + End If + Throw New Exception("$登录失败：" & ErrorMessage) + End If End If '通用关键字检测 If AllMessage.Contains("403") Then @@ -1643,8 +1655,11 @@ NextVersion: GameSize = New Size(875 - 2, 540 - 2) End Select GameSize.Height -= 29.5 * DPI / 96 '标题栏高度 - If McVersionCurrent.Version.McCodeMain <= 12 AndAlso McLaunchJavaSelected.VersionCode <= 8 AndAlso - Not McVersionCurrent.Version.HasOptiFine AndAlso Not McVersionCurrent.Version.HasForge Then '修复 #3463：1.12.2-，JRE 8 下窗口大小为设置大小的 DPI% 倍 + If McVersionCurrent.Version.McCodeMain <= 12 AndAlso + McLaunchJavaSelected.VersionCode <= 8 AndAlso McLaunchJavaSelected.Version.Revision >= 200 AndAlso McLaunchJavaSelected.Version.Revision <= 321 AndAlso + Not McVersionCurrent.Version.HasOptiFine AndAlso Not McVersionCurrent.Version.HasForge Then + '修复 #3463：1.12.2-，JRE 8u200~321 下窗口大小为设置大小的 DPI% 倍 + McLaunchLog($"已应用窗口大小过大修复（{McLaunchJavaSelected.Version.Revision}）") GameSize.Width /= DPI / 96 GameSize.Height /= DPI / 96 End If diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb index ca8315b..2d87c22 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb @@ -85,7 +85,7 @@ Public Module ModMinecraft Next If Not Renamed Then CacheMcFolderList.Add(New McFolder With {.Name = Name, .Path = Path, .Type = McFolderType.Custom}) Else - Hint("无效的 Minecraft 文件夹：" & Path, HintType.Critical) + Hint("无法访问 Minecraft 文件夹：" & Path, HintType.Critical) End If Next @@ -2308,8 +2308,8 @@ OnLoaded: End If Left = Left.ToLowerInvariant Right = Right.ToLowerInvariant - Dim Lefts = RegexSearch(Left.Replace("快照", "snapshot"), "[a-z]+|[0-9]+") - Dim Rights = RegexSearch(Right.Replace("快照", "snapshot"), "[a-z]+|[0-9]+") + Dim Lefts = RegexSearch(Left.Replace("快照", "snapshot").Replace("预览版", "pre"), "[a-z]+|[0-9]+") + Dim Rights = RegexSearch(Right.Replace("快照", "snapshot").Replace("预览版", "pre"), "[a-z]+|[0-9]+") Dim i As Integer = 0 While True '两边均缺失，感觉是一个东西 @@ -2358,15 +2358,11 @@ NextEntry: ''' ''' 比较两个版本名的排序器。 ''' - Public Class VersionSorter + Public Class VersionComparer Implements IComparer(Of String) - Public IsDecreased As Boolean = True Public Function Compare(x As String, y As String) As Integer Implements IComparer(Of String).Compare - Return VersionSortInteger(x, y) * If(IsDecreased, -1, 1) + Return VersionSortInteger(x, y) End Function - Public Sub New(Optional IsDecreased As Boolean = True) - Me.IsDecreased = IsDecreased - End Sub End Class ''' diff --git a/Plain Craft Launcher 2/Modules/Minecraft/MyLocalModItem.xaml b/Plain Craft Launcher 2/Modules/Minecraft/MyLocalModItem.xaml index d626409..445f44b 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/MyLocalModItem.xaml +++ b/Plain Craft Launcher 2/Modules/Minecraft/MyLocalModItem.xaml @@ -30,12 +30,12 @@ - + - + diff --git a/Plain Craft Launcher 2/Modules/Minecraft/MyLocalModItem.xaml.vb b/Plain Craft Launcher 2/Modules/Minecraft/MyLocalModItem.xaml.vb index df794e6..f826928 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/MyLocalModItem.xaml.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/MyLocalModItem.xaml.vb @@ -303,30 +303,33 @@ Public Class MyLocalModItem #End Region + Private Function GetUpdateCompareDescription() As String + Dim CurrentName = Entry.CompFile.FileName.Replace(".jar", "") + Dim NewestName = Entry.UpdateFile.FileName.Replace(".jar", "") + '简化名称对比 + Dim CurrentSegs = CurrentName.Split("-"c).ToList() + Dim NewestSegs = NewestName.Split("-"c).ToList() + Dim Shortened As Boolean = False + For Each Seg In CurrentSegs.ToList() + If Not NewestSegs.Contains(Seg) Then Continue For + CurrentSegs.Remove(Seg) + NewestSegs.Remove(Seg) + Shortened = True + Next + If Shortened AndAlso CurrentSegs.Any() AndAlso NewestSegs.Any() Then + CurrentName = Join(CurrentSegs, "-") + NewestName = Join(NewestSegs, "-") + Entry._Version = CurrentName '使用网络信息作为显示的版本号 + End If + Return $"当前版本：{CurrentName}（{GetTimeSpanString(Entry.CompFile.ReleaseDate - Date.Now, False)}）{vbCrLf}最新版本：{NewestName}（{GetTimeSpanString(Entry.UpdateFile.ReleaseDate - Date.Now, False)}）" + End Function Public Sub Refresh() Handles Me.Loaded RunInUi( Sub() '更新 If Entry.CanUpdate Then BtnUpdate.Visibility = Visibility.Visible - Dim CurrentName = Entry.CompFile.FileName.Replace(".jar", "") - Dim NewestName = Entry.UpdateFile.FileName.Replace(".jar", "") - '简化名称对比 - Dim CurrentSegs = CurrentName.Split("-"c).ToList() - Dim NewestSegs = NewestName.Split("-"c).ToList() - Dim Shortened As Boolean = False - For Each Seg In CurrentSegs.ToList() - If Not NewestSegs.Contains(Seg) Then Continue For - CurrentSegs.Remove(Seg) - NewestSegs.Remove(Seg) - Shortened = True - Next - If Shortened AndAlso CurrentSegs.Any() AndAlso NewestSegs.Any() Then - CurrentName = Join(CurrentSegs, "-") - NewestName = Join(NewestSegs, "-") - Entry._Version = CurrentName '使用网络信息作为显示的版本号 - End If - BtnUpdate.ToolTip = $"当前版本：{CurrentName} ({Entry.CompFile.ReleaseDate:yyyy/MM/dd HH:mm:ss}){vbCrLf}最新版本：{NewestName} ({Entry.UpdateFile.ReleaseDate:yyyy/MM/dd HH:mm:ss}){vbCrLf}点击以更新，右键查看更新日志。" + BtnUpdate.ToolTip = $"{GetUpdateCompareDescription()}{vbCrLf}点击以更新，右键查看更新日志。" Else BtnUpdate.Visibility = Visibility.Collapsed End If @@ -476,20 +479,57 @@ Public Class MyLocalModItem '触发更新 Private Sub BtnUpdate_Click(sender As Object, e As EventArgs) Handles BtnUpdate.Click + If MyMsgBox($"是否要更新 {Entry.Name}？{vbCrLf}{vbCrLf}{GetUpdateCompareDescription()}", "Mod 更新确认", "更新", "取消") = 2 Then Return FrmVersionMod.UpdateMods({Entry}) End Sub '自适应（#4465） - Private Sub PanTitle_SizeChanged(sender As Object, e As SizeChangedEventArgs) Handles PanTitle.SizeChanged - If ColumnExtend.Width.IsStar AndAlso ColumnExtend.ActualWidth < 0.5 Then - '压缩 Subtitle - ColumnSubtitle.Width = New GridLength(1, GridUnitType.Star) - ColumnExtend.Width = New GridLength(0, GridUnitType.Pixel) - ElseIf Not ColumnExtend.Width.IsStar AndAlso Not LabSubtitle.IsTextTrimmed Then - '向右展开 Subtitle - ColumnSubtitle.Width = GridLength.Auto - ColumnExtend.Width = New GridLength(1, GridUnitType.Star) - End If + Private Sub PanTitle_SizeChanged() Handles PanTitle.SizeChanged + '0：全部舒展：Auto - Auto - (Auto) - 1* + '1：压缩 Subtitle：Auto - 1* - (Auto) - 0 + '2：继续压缩 Title：1* - 0 - (Auto) - 0 + Dim CurrentCompressLevel As Integer = + If(ColumnExtend.Width.IsStar, 0, If(ColumnTitle.Width.IsStar, 2, 1)) 'Subtitle 可能是 Collapsed + Dim NewCompressLevel As Integer + Select Case CurrentCompressLevel + Case 0 + If ColumnExtend.ActualWidth < 0.5 Then + NewCompressLevel = If(LabSubtitle.Visibility = Visibility.Collapsed, 2, 1) + Else + Return + End If + Case 1 + If ColumnSubtitle.ActualWidth < 0.5 Then + NewCompressLevel = 2 + ElseIf Not LabSubtitle.IsTextTrimmed Then + NewCompressLevel = 0 + Else + Return + End If + Case 2 + If Not LabTitle.IsTextTrimmed Then + NewCompressLevel = If(LabSubtitle.Visibility = Visibility.Collapsed, 0, 1) + Else + Return + End If + End Select + Select Case NewCompressLevel + Case 0 + '全部舒展：Auto - Auto - (Auto) - 1* + ColumnTitle.Width = GridLength.Auto + ColumnSubtitle.Width = GridLength.Auto + ColumnExtend.Width = New GridLength(1, GridUnitType.Star) + Case 1 + '压缩 Subtitle：Auto - 1* - (Auto) - 0 + ColumnTitle.Width = GridLength.Auto + ColumnSubtitle.Width = New GridLength(1, GridUnitType.Star) + ColumnExtend.Width = New GridLength(0, GridUnitType.Pixel) + Case 2 + '继续压缩 Title：1* - 0 - (Auto) - 0 + ColumnTitle.Width = New GridLength(1, GridUnitType.Star) + ColumnSubtitle.Width = New GridLength(0, GridUnitType.Pixel) + ColumnExtend.Width = New GridLength(0, GridUnitType.Pixel) + End Select End Sub End Class diff --git a/Plain Craft Launcher 2/Modules/ModMusic.vb b/Plain Craft Launcher 2/Modules/ModMusic.vb index 93062fe..6a7e34d 100644 --- a/Plain Craft Launcher 2/Modules/ModMusic.vb +++ b/Plain Craft Launcher 2/Modules/ModMusic.vb @@ -14,8 +14,8 @@ ''' 初始化音乐播放列表。 ''' ''' 强制全部重新载入列表。 - ''' 在重载列表时避免让某项成为第一项。 - Private Sub MusicListInit(ForceReload As Boolean, Optional IgnoreFirst As String = "") + ''' 在重载列表时避免让某项成为第一项。 + Private Sub MusicListInit(ForceReload As Boolean, Optional PreventFirst As String = Nothing) If ForceReload Then MusicAllList = Nothing Try '初始化全部可用音乐列表 @@ -31,10 +31,10 @@ End If '打乱顺序播放 MusicWaitingList = If(Setup.Get("UiMusicRandom"), Shuffle(New List(Of String)(MusicAllList)), New List(Of String)(MusicAllList)) - If Not IgnoreFirst = "" AndAlso Not Not MusicWaitingList.Any() AndAlso MusicWaitingList(0) = IgnoreFirst Then + If PreventFirst IsNot Nothing AndAlso MusicWaitingList.FirstOrDefault = PreventFirst Then '若需要避免成为第一项的为第一项，则将它放在最后 MusicWaitingList.RemoveAt(0) - MusicWaitingList.Add(IgnoreFirst) + MusicWaitingList.Add(PreventFirst) End If Catch ex As Exception Log(ex, "初始化音乐列表失败", LogLevel.Feedback) @@ -42,6 +42,7 @@ End Sub ''' ''' 获取下一首播放的音乐路径并将其从列表中移除。 + ''' 如果没有，可能会返回 Nothing。 ''' Private Function DequeueNextMusicAddress() As String '初始化，确保存在音乐 @@ -50,10 +51,10 @@ If MusicWaitingList.Any() Then DequeueNextMusicAddress = MusicWaitingList(0) MusicWaitingList.RemoveAt(0) - If Not MusicWaitingList.Any() Then MusicListInit(False, DequeueNextMusicAddress) Else - DequeueNextMusicAddress = "" + DequeueNextMusicAddress = Nothing End If + If Not MusicWaitingList.Any() Then MusicListInit(False, DequeueNextMusicAddress) End Function #End Region @@ -64,44 +65,45 @@ ''' 刷新背景音乐按钮 UI 与设置页 UI。 ''' Private Sub MusicRefreshUI() - RunInUi(Sub() - Try + RunInUi( + Sub() + Try - If Not MusicAllList.Any() Then - '无背景音乐 - FrmMain.BtnExtraMusic.Show = False + If Not MusicAllList.Any() Then + '无背景音乐 + FrmMain.BtnExtraMusic.Show = False + Else + '有背景音乐 + FrmMain.BtnExtraMusic.Show = True + Dim ToolTipText As String + If MusicState = MusicStates.Pause Then + FrmMain.BtnExtraMusic.Logo = Logo.IconPlay + FrmMain.BtnExtraMusic.LogoScale = 0.8 + ToolTipText = "已暂停：" & GetFileNameWithoutExtentionFromPath(MusicCurrent) + If MusicAllList.Count > 1 Then + ToolTipText += vbCrLf & "左键恢复播放，右键播放下一曲。" Else - '有背景音乐 - FrmMain.BtnExtraMusic.Show = True - Dim ToolTipText As String - If MusicState = MusicStates.Pause Then - FrmMain.BtnExtraMusic.Logo = Logo.IconPlay - FrmMain.BtnExtraMusic.LogoScale = 0.8 - ToolTipText = "已暂停：" & GetFileNameWithoutExtentionFromPath(MusicCurrent) - If MusicAllList.Count > 1 Then - ToolTipText += vbCrLf & "左键恢复播放，右键播放下一曲。" - Else - ToolTipText += vbCrLf & "左键恢复播放，右键重新从头播放。" - End If - Else - FrmMain.BtnExtraMusic.Logo = Logo.IconMusic - FrmMain.BtnExtraMusic.LogoScale = 1 - ToolTipText = "正在播放：" & GetFileNameWithoutExtentionFromPath(MusicCurrent) - If MusicAllList.Count > 1 Then - ToolTipText += vbCrLf & "左键暂停，右键播放下一曲。" - Else - ToolTipText += vbCrLf & "左键暂停，右键重新从头播放。" - End If - End If - FrmMain.BtnExtraMusic.ToolTip = ToolTipText - ToolTipService.SetVerticalOffset(FrmMain.BtnExtraMusic, If(ToolTipText.Contains(vbLf), 10, 16)) + ToolTipText += vbCrLf & "左键恢复播放，右键重新从头播放。" End If - If FrmSetupUI IsNot Nothing Then FrmSetupUI.MusicRefreshUI() + Else + FrmMain.BtnExtraMusic.Logo = Logo.IconMusic + FrmMain.BtnExtraMusic.LogoScale = 1 + ToolTipText = "正在播放：" & GetFileNameWithoutExtentionFromPath(MusicCurrent) + If MusicAllList.Count > 1 Then + ToolTipText += vbCrLf & "左键暂停，右键播放下一曲。" + Else + ToolTipText += vbCrLf & "左键暂停，右键重新从头播放。" + End If + End If + FrmMain.BtnExtraMusic.ToolTip = ToolTipText + ToolTipService.SetVerticalOffset(FrmMain.BtnExtraMusic, If(ToolTipText.Contains(vbLf), 10, 16)) + End If + If FrmSetupUI IsNot Nothing Then FrmSetupUI.MusicRefreshUI() - Catch ex As Exception - Log(ex, "刷新背景音乐 UI 失败", LogLevel.Feedback) - End Try - End Sub) + Catch ex As Exception + Log(ex, "刷新背景音乐 UI 失败", LogLevel.Feedback) + End Try + End Sub) End Sub ''' @@ -132,8 +134,12 @@ Hint("重新播放：" & GetFileNameFromPath(MusicCurrent), HintType.Finish) Else Dim Address As String = DequeueNextMusicAddress() - MusicStartPlay(Address) - Hint("正在播放：" & GetFileNameFromPath(Address), HintType.Finish) + If Address Is Nothing Then + Hint("没有可以播放的音乐！", HintType.Critical) + Else + MusicStartPlay(Address) + Hint("正在播放：" & GetFileNameFromPath(Address), HintType.Finish) + End If End If MusicRefreshUI() End Sub @@ -183,11 +189,15 @@ End If Else Dim Address As String = DequeueNextMusicAddress() - Try - MusicStartPlay(Address, IsFirstLoad) - If ShowHint Then Hint("背景音乐已刷新：" & GetFileNameFromPath(Address), HintType.Finish, False) - Catch - End Try + If Address Is Nothing Then + If ShowHint Then Hint("没有可以播放的音乐！", HintType.Critical) + Else + Try + MusicStartPlay(Address, IsFirstLoad) + If ShowHint Then Hint("背景音乐已刷新：" & GetFileNameFromPath(Address), HintType.Finish, False) + Catch + End Try + End If End If MusicRefreshUI() @@ -199,11 +209,10 @@ ''' 开始播放音乐。 ''' Private Sub MusicStartPlay(Address As String, Optional IsFirstLoad As Boolean = False) - If Not Address = "" Then - Log("[Music] 播放开始：" & Address) - MusicCurrent = Address - RunInNewThread(Sub() MusicLoop(IsFirstLoad), "Music", ThreadPriority.BelowNormal) - End If + If Address Is Nothing Then Return + Log("[Music] 播放开始：" & Address) + MusicCurrent = Address + RunInNewThread(Sub() MusicLoop(IsFirstLoad), "Music", ThreadPriority.BelowNormal) End Sub '播放与暂停 @@ -293,7 +302,8 @@ End If If ex.Message.Contains("Got a frame at sample rate") OrElse ex.Message.Contains("does not support changes to") Then Hint("播放音乐失败（" & GetFileNameFromPath(MusicCurrent) & "）：PCL 不支持播放音频属性在中途发生变化的音乐", HintType.Critical) - ElseIf Not (MusicCurrent.EndsWithF(".wav", True) OrElse MusicCurrent.EndsWithF(".mp3", True) OrElse MusicCurrent.EndsWithF(".flac", True)) Then + ElseIf Not (MusicCurrent.EndsWithF(".wav", True) OrElse MusicCurrent.EndsWithF(".mp3", True) OrElse MusicCurrent.EndsWithF(".flac", True)) OrElse + ex.Message.Contains("0xC00D36C4") Then '#5096：不支持给定的 URL 的字节流类型。 (异常来自 HRESULT:0xC00D36C4) Hint("播放音乐失败（" & GetFileNameFromPath(MusicCurrent) & "）：PCL 可能不支持此音乐格式，请将格式转换为 .wav、.mp3 或 .flac 后再试", HintType.Critical) Else Log(ex, "播放音乐失败（" & GetFileNameFromPath(MusicCurrent) & "）", LogLevel.Hint) @@ -301,6 +311,9 @@ '将播放错误的音乐从列表中移除 MusicAllList.Remove(MusicCurrent) MusicWaitingList.Remove(MusicCurrent) + MusicRefreshUI() + '等待 2 秒后继续播放 + Thread.Sleep(2000) If TypeOf ex Is FileNotFoundException Then MusicRefreshPlay(True, IsFirstLoad) Else diff --git a/Plain Craft Launcher 2/Modules/ModSecret.vb b/Plain Craft Launcher 2/Modules/ModSecret.vb index f5c2c24..52fd4d2 100644 --- a/Plain Craft Launcher 2/Modules/ModSecret.vb +++ b/Plain Craft Launcher 2/Modules/ModSecret.vb @@ -109,9 +109,7 @@ Friend Module ModSecret Client.Headers("User-Agent") = "PCL2/" & VersionStandardCode End If Client.Headers("Referer") = "http://" & VersionCode & ".pcl2.open.server/" - If Url.Contains("api.curseforge") Then - Client.Headers("x-api-key") = CurseForgeAPIKey - End If + If Url.Contains("api.curseforge.com") Then Client.Headers("x-api-key") = CurseForgeAPIKey End Sub ''' ''' 设置 Headers 的 UA、Referer。 @@ -125,9 +123,7 @@ Friend Module ModSecret Request.UserAgent = "PCL2/" & VersionStandardCode End If Request.Referer = "http://" & VersionCode & ".pcl2.open.server/" - If Url.Contains("api.curseforge") Then - Request.Headers("x-api-key") = CurseForgeAPIKey - End If + If Url.Contains("api.curseforge.com") Then Request.Headers("x-api-key") = CurseForgeAPIKey End Sub #End Region diff --git a/Plain Craft Launcher 2/My Project/AssemblyInfo.vb b/Plain Craft Launcher 2/My Project/AssemblyInfo.vb index a3e1e30..8b6b736 100644 --- a/Plain Craft Launcher 2/My Project/AssemblyInfo.vb +++ b/Plain Craft Launcher 2/My Project/AssemblyInfo.vb @@ -51,6 +51,6 @@ Imports System.Runtime.InteropServices ' 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 ' 方法是按如下所示使用“*” - - + + diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml index 7333268..28f238f 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml @@ -20,8 +20,13 @@ - - + + + + + + + diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb index 055b2f1..c988751 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb @@ -59,30 +59,86 @@ Me.Topmost = If(Topmost, "") End Sub End Class + + Private VersionFilter As String + Private IsMajorVersionFilter As Boolean '是否按大版本号筛选（1.21 / 1.20 / 1.19 / ...）而非小版本号（1.21.1 / 1.21 / 1.20.4 / ...） Private Sub Load_OnFinish() + '初始化筛选器 + Dim VersionFilters As List(Of String) + + '按小版本号筛选？ + IsMajorVersionFilter = False + VersionFilters = CompFileLoader.Output.SelectMany(Function(v) v.GameVersions).Select(Function(v) GetGroupedVersionName(v, IsMajorVersionFilter, True)). + Distinct.OrderByDescending(Function(s) s, New VersionComparer).ToList + '按大版本号筛选？ + If VersionFilters.Count >= 9 Then + IsMajorVersionFilter = True + VersionFilters = CompFileLoader.Output.SelectMany(Function(v) v.GameVersions).Select(Function(v) GetGroupedVersionName(v, IsMajorVersionFilter, True)). + Distinct.OrderByDescending(Function(s) s, New VersionComparer).ToList + End If + + 'UI 化筛选器 + PanFilter.Children.Clear() + If VersionFilters.Count <= 2 Then + CardFilter.Visibility = Visibility.Collapsed + VersionFilter = Nothing + Else + CardFilter.Visibility = Visibility.Visible + VersionFilters.Insert(0, "全部") + '转化为按钮 + For Each Version As String In VersionFilters + Dim NewButton As New MyRadioButton With { + .Text = Version, .Margin = New Thickness(2, 0, 2, 0), .ColorType = MyRadioButton.ColorState.Highlight} + NewButton.LabText.Margin = New Thickness(-2, 0, 8, 0) + AddHandler NewButton.Check, + Sub(sender As MyRadioButton, raiseByMouse As Boolean) + PanScroll.ScrollToHome() + VersionFilter = If(sender.Text = "全部", Nothing, sender.Text) + UpdateFilterResult() + End Sub + PanFilter.Children.Add(NewButton) + Next + '自动选择 + Dim ToCheck As MyRadioButton = Nothing + If TargetVersion <> "" Then + Dim TargetFile = CompFileLoader.Output.FirstOrDefault(Function(v) v.GameVersions.Contains(TargetVersion)) + If TargetFile IsNot Nothing Then + Dim TargetGroup = GetGroupedVersionName(TargetVersion, IsMajorVersionFilter, True) + For Each Button As MyRadioButton In PanFilter.Children + If Button.Text <> TargetGroup Then Continue For + ToCheck = Button + Exit For + Next + End If + End If + If ToCheck Is Nothing Then ToCheck = PanFilter.Children(0) + ToCheck.Checked = True + End If + + '更新筛选结果（文件列表 UI 化） + UpdateFilterResult() + End Sub + Private Sub UpdateFilterResult() Dim TargetCardName As String = If(TargetVersion <> "" OrElse TargetLoader <> CompModLoaderType.Any, $"所选版本：{If(TargetLoader <> CompModLoaderType.Any, TargetLoader.ToString & " ", "")}{TargetVersion}", "") - '初始化字典 + '归类到卡片下 Dim Dict As New SortedDictionary(Of String, List(Of CompFile))(New CardSorter(TargetCardName)) - Dict.Add("未知版本", New List(Of CompFile)) + Dict.Add("其他版本", New List(Of CompFile)) Dim SupportedLoaders As New List(Of Integer)([Enum].GetValues(GetType(CompModLoaderType))) For Each Version As CompFile In CompFileLoader.Output For Each GameVersion In Version.GameVersions + '检查是否符合版本筛选器 + If VersionFilter IsNot Nothing AndAlso + GetGroupedVersionName(GameVersion, IsMajorVersionFilter, True) <> VersionFilter Then Continue For '决定添加到哪个卡片 - Dim Ver As String - If GameVersion Is Nothing Then - Ver = "未知版本" - ElseIf GameVersion.Contains("w") OrElse GameVersion.Contains("pre") OrElse GameVersion.Contains("rc") Then - Ver = "快照版本" - ElseIf GameVersion.StartsWithF("1.0") Then - Ver = "远古版本" - Else - Ver = GameVersion - End If + Dim Ver As String = GetGroupedVersionName(GameVersion, False, False) '遍历加入的加载器列表 Dim Loaders As New List(Of String) - If Project.Type = CompType.Mod Then + If Project.ModLoaders.Count > 1 AndAlso '至少有两个加载器 + Project.Type = CompType.Mod AndAlso '是 Mod + Ver.StartsWith("1.") Then '不是 “快照版本” 之类的 For Each Loader In Version.ModLoaders + If Loader = CompModLoaderType.Quilt AndAlso Setup.Get("ToolDownloadIgnoreQuilt") Then Continue For If SupportedLoaders.Contains(Loader) Then Loaders.Add(Loader.ToString & " ") Next End If @@ -101,16 +157,16 @@ For Each Version As CompFile In CompFileLoader.Output If Version.GameVersions.Contains(TargetVersion) AndAlso (TargetLoader = CompModLoaderType.Any OrElse Version.ModLoaders.Contains(TargetLoader)) Then + '检查是否符合版本筛选器 + If VersionFilter IsNot Nothing AndAlso + Not Version.GameVersions.Any(Function(v) GetGroupedVersionName(v, IsMajorVersionFilter, True) = VersionFilter) Then Continue For If Not Dict(TargetCardName).Contains(Version) Then Dict(TargetCardName).Add(Version) End If Next End If - -#Region "转化为 UI" + '转化为 UI Try - '清空当前 - PanMain.Children.Clear() - '转化为 UI + PanResults.Children.Clear() For Each Pair As KeyValuePair(Of String, List(Of CompFile)) In Dict If Not Pair.Value.Any() Then Continue For '增加卡片 @@ -118,7 +174,7 @@ Dim NewStack As New StackPanel With {.Margin = New Thickness(20, MyCard.SwapedHeight, 18, 0), .VerticalAlignment = VerticalAlignment.Top, .RenderTransform = New TranslateTransform(0, 0), .Tag = Pair.Value} NewCard.Children.Add(NewStack) NewCard.SwapControl = NewStack - PanMain.Children.Add(NewCard) + PanResults.Children.Add(NewCard) '确定卡片是否展开 If Pair.Key = TargetCardName OrElse (FrmMain.PageCurrent.Additional IsNot Nothing AndAlso '#2761 @@ -128,20 +184,29 @@ NewCard.IsSwaped = True End If '增加提示 - If Pair.Key = "未知版本" Then - NewStack.Children.Add(New MyHint With {.Text = "由于 API 的版本信息更新缓慢，可能无法识别刚更新不久的 MC 版本，只需等待几天即可自动恢复正常。", .IsWarn = False, .Margin = New Thickness(0, 0, 0, 7)}) + If Pair.Key = "其他版本" Then + NewStack.Children.Add(New MyHint With {.Text = "由于版本信息更新缓慢，可能无法识别刚更新的 MC 版本，只需等待几天即可自动恢复正常。", .IsWarn = False, .Margin = New Thickness(0, 0, 0, 7)}) End If Next '如果只有一张卡片，展开第一张卡片 - If PanMain.Children.Count = 1 Then - CType(PanMain.Children(0), MyCard).IsSwaped = False + If PanResults.Children.Count = 1 Then + CType(PanResults.Children(0), MyCard).IsSwaped = False End If Catch ex As Exception Log(ex, "可视化工程下载列表出错", LogLevel.Feedback) End Try -#End Region - End Sub + Private Function GetGroupedVersionName(Name As String, MajorOnly As Boolean, FoldOldRelease As Boolean) As String + If Name Is Nothing Then + Return "其他版本" + ElseIf Name.Contains("w") Then + Return "快照版本" + ElseIf Name.StartsWith("1.0") OrElse Not Name.StartsWith("1.") OrElse (FoldOldRelease AndAlso Val(Name.Split(".")(1)) < 10) Then + Return "远古版本" + Else + Return If(MajorOnly, "1." & Name.Split(".")(1).BeforeFirst(" "), Name) + End If + End Function #End Region @@ -249,7 +314,7 @@ If Not Version.IsLoaded Then Version.Load() If Not Version.Modable Then Return False If File.GameVersions.Any(Function(v) v.Contains(".")) AndAlso - Not File.GameVersions.Any(Function(v) v.Contains(".") AndAlso v.Split(".")(1) = Version.Version.McCodeMain.ToString) Then Return False + Not File.GameVersions.Any(Function(v) v.Contains(".") AndAlso v = Version.Version.McName) Then Return False If AllowForge Is Nothing OrElse AllowFabric Is Nothing Then Return True If AllowForge AndAlso (Version.Version.HasForge OrElse Version.Version.HasNeoForge) Then Return True If AllowFabric AndAlso Version.Version.HasFabric Then Return True @@ -315,10 +380,10 @@ '弹窗要求选择保存位置 Dim Target As String Target = SelectAs("选择保存位置", FileName, - Desc & "文件|" & - If(Project.Type = CompType.Mod, - If(File.FileName.EndsWith(".litemod"), "*.litemod", "*.jar"), - If(File.FileName.EndsWith(".mrpack"), "*.mrpack", "*.zip")), DefaultFolder) + Desc & "文件|" & + If(Project.Type = CompType.Mod, + If(File.FileName.EndsWith(".litemod"), "*.litemod", "*.jar"), + If(File.FileName.EndsWith(".mrpack"), "*.mrpack", "*.zip")), DefaultFolder) If Not Target.Contains("\") Then Exit Sub '构造步骤加载器 Dim LoaderName As String = Desc & "下载：" & GetFileNameWithoutExtentionFromPath(Target) & " " diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb index e085dd7..f2eb250 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb @@ -113,12 +113,14 @@ PageDownloadMod.Storage = New CompProjectStorage PageDownloadMod.Page = 0 CompProjectCache.Clear() + CompFilesCache.Clear() If FrmDownloadMod IsNot Nothing Then FrmDownloadMod.PageLoaderRestart() ItemMod.Checked = True Case FormMain.PageSubType.DownloadPack PageDownloadPack.Storage = New CompProjectStorage PageDownloadPack.Page = 0 CompProjectCache.Clear() + CompFilesCache.Clear() If FrmDownloadPack IsNot Nothing Then FrmDownloadPack.PageLoaderRestart() ItemPack.Checked = True Case FormMain.PageSubType.DownloadClient diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb index ae9ee47..113ff25 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb @@ -1,12 +1,44 @@ Public Class PageDownloadMod Public Const PageSize = 40 + ''' + ''' 在切换到该页面时自动设置的目标版本。 + ''' + Public Shared TargetVersion As McVersion = Nothing '加载器信息 Public Shared Loader As New LoaderTask(Of CompProjectRequest, Integer)("CompProject Mod", AddressOf CompProjectsGet, AddressOf LoaderInput) With {.ReloadTimeout = 60 * 1000} Public Shared Storage As New CompProjectStorage Public Shared Page As Integer = 0 - Private Sub PageDownloadMod_Inited(sender As Object, e As EventArgs) Handles Me.Initialized + Private IsLoaderInited As Boolean = False + Private Sub PageDownloadMod_Inited(sender As Object, e As EventArgs) Handles Me.Loaded + '不知道从 Initialized 改成 Loaded 会不会有问题，但用 Initialized 会导致初始的筛选器修改被覆盖回默认值 + If TargetVersion IsNot Nothing Then + '设置目标 + ResetFilter() '重置筛选器 + TextSearchVersion.Text = TargetVersion.Version.McName + Dim GetTargetItemByName = + Function(Name As String) As MyComboBoxItem + For Each Item As MyComboBoxItem In ComboSearchLoader.Items + If Item.Content = Name Then Return Item + Next + Return ComboSearchLoader.Items(0) + End Function + If TargetVersion.Version.HasForge Then + ComboSearchLoader.SelectedItem = GetTargetItemByName("Forge") + ElseIf TargetVersion.Version.HasFabric Then + ComboSearchLoader.SelectedItem = GetTargetItemByName("Fabric") + ElseIf TargetVersion.Version.HasNeoForge Then + ComboSearchLoader.SelectedItem = GetTargetItemByName("NeoForge") + End If + TargetVersion = Nothing + '如果已经完成请求，则重新开始 + If IsLoaderInited Then StartNewSearch() + PanScroll.ScrollToHome() + End If + '加载器初始化 + If IsLoaderInited Then Return + IsLoaderInited = True PageLoaderInit(Load, PanLoad, PanContent, PanAlways, Loader, AddressOf Load_OnFinish, AddressOf LoaderInput) If McVersionHighest = -1 Then McVersionHighest = Math.Max(McVersionHighest, Integer.Parse(CType(TextSearchVersion.Items(1), MyComboBoxItem).Content.ToString.Split(".")(1))) End Sub @@ -118,7 +150,7 @@ End Sub '重置按钮 - Private Sub BtnSearchReset_Click(sender As Object, e As EventArgs) Handles BtnSearchReset.Click + Private Sub ResetFilter() Handles BtnSearchReset.Click TextSearchName.Text = "" TextSearchVersion.Text = "全部 (也可自行输入)" TextSearchVersion.SelectedIndex = 0 diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml.vb index 0d3032b..595aecb 100644 --- a/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml.vb @@ -105,7 +105,7 @@ Download: GoTo Download Case 6 Log("[Page] 主页预设：OpenBMCLAPI 仪表盘 Lite") - Url = "https://pcl-bmcl.milulu.xyz/" + Url = "https://pcl-bmcl.milu.ink/" GoTo Download Case 7 Log("[Page] 主页预设：主页市场") @@ -123,6 +123,10 @@ Download: Log("[Page] 主页预设：OpenMCIM Dashboard") Url = "https://files.mcimirror.top/PCL" GoTo Download + Case 11 + Log("[Page] 主页预设：杂志主页") + Url = "http://pclhomeplazaoss.lingyunawa.top:26994/d/Homepages/Ext1nguisher/Custom.xaml" + GoTo Download End Select End Select RunInUi(Sub() LoadContent(Content)) diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuthSkin.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuthSkin.xaml.vb index ca21ffa..fec81e6 100644 --- a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuthSkin.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuthSkin.xaml.vb @@ -70,9 +70,11 @@ End Try End Sub) End Sub - Private Sub BtnExit_Click() Handles BtnExit.Click + Public Shared Sub ExitLogin() Handles BtnExit.Click Setup.Set("CacheAuthAccess", "") Setup.Set("CacheAuthUuid", "") + Setup.Set("CacheAuthName", "") + McLoginAuthLoader.Input = Nothing '防止因为输入的用户名密码相同，直接使用了上次登录的加载器结果 FrmLaunchLeft.RefreshPage(False, True) End Sub diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginNideSkin.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginNideSkin.xaml.vb index bceb7c8..84fa773 100644 --- a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginNideSkin.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginNideSkin.xaml.vb @@ -47,8 +47,9 @@ Private Sub BtnEdit_Click(sender As Object, e As EventArgs) Handles BtnEdit.Click OpenWebsite("https://login.mc-user.com:233/account/changepw") End Sub - Private Sub BtnExit_Click() Handles BtnExit.Click + Public Shared Sub ExitLogin() Handles BtnExit.Click Setup.Set("CacheNideAccess", "") + McLoginNideLoader.Input = Nothing '防止因为输入的用户名密码相同，直接使用了上次登录的加载器结果 FrmLaunchLeft.RefreshPage(False, True) End Sub diff --git a/Plain Craft Launcher 2/Pages/PageLink/PageLinkIoi.xaml.vb b/Plain Craft Launcher 2/Pages/PageLink/PageLinkIoi.xaml.vb index c1cbe61..f1e6312 100644 --- a/Plain Craft Launcher 2/Pages/PageLink/PageLinkIoi.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageLink/PageLinkIoi.xaml.vb @@ -111,8 +111,6 @@ Public Class PageLinkIoi End Sub '复制联机码 Public Shared Sub BtnLeftCopy_Click() Handles BtnLeftCopy.Click - ClipboardSet(IoiId.Substring(4) & SecretEncrypt(GetPlayerName), False) - Hint("已复制联机码！", HintType.Finish) End Sub #End Region diff --git a/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml b/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml index 4567723..8142163 100644 --- a/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml +++ b/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml @@ -104,126 +104,107 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Plain Craft Launcher 2/Pages/PageOther/PageOtherLeft.xaml b/Plain Craft Launcher 2/Pages/PageOther/PageOtherLeft.xaml index 119a07c..874928f 100644 --- a/Plain Craft Launcher 2/Pages/PageOther/PageOtherLeft.xaml +++ b/Plain Craft Launcher 2/Pages/PageOther/PageOtherLeft.xaml @@ -15,9 +15,9 @@ LogoScale="0.98" Logo="M149.883623 873.911618c47.094581 47.094581 101.765247 83.95121 162.783444 109.75085 63.065787 26.618676 130.226755 40.337532 199.230553 40.337532 69.003799 0 136.164767-13.514097 199.230554-40.337532 61.018196-25.79964 115.688862-62.656269 162.783444-109.75085s83.95121-101.765247 109.75085-162.783444c26.618676-63.065787 40.337532-130.226755 40.337532-199.230554 0-69.003799-13.514097-136.164767-40.337532-199.230553-25.79964-61.018196-62.656269-115.688862-109.75085-162.783444-46.889822-46.889822-101.765247-83.95121-162.783444-109.75085C648.062388 13.514097 580.90142 0 511.89762 0s-136.164767 13.514097-199.230553 40.337532c-61.018196 25.79964-115.688862 62.656269-162.783444 109.75085s-83.95121 101.765247-109.75085 162.783444C13.514097 375.732853 0 442.893821 0 511.89762s13.514097 136.164767 40.337532 199.230554c25.594881 61.018196 62.656269 115.688862 109.546091 162.783444zM97.670066 511.89762c0-228.511098 185.921216-414.227554 414.227554-414.227554 228.511098 0 414.227554 185.921216 414.227555 414.227554S740.408718 926.125175 511.89762 926.125175c-228.511098 0-414.227554-185.716457-414.227554-414.227555z M539.130574 244.277544c-8.190362-4.709458-17.609278-7.371326-27.232954-7.371325-9.623675 0-19.042591 2.457109-27.232953 7.371325-16.790242 9.623675-27.232953 27.847231-27.232953 47.299341 0 30.09958 24.366327 54.465907 54.465906 54.465906 30.09958 0 54.465907-24.366327 54.465907-54.465906 0-19.45211-10.442711-37.470906-27.232953-47.299341zM566.363527 732.218356v-284.615077c0-30.09958-24.366327-54.465907-54.465907-54.465906-30.09958 0-54.465907 24.366327-54.465906 54.465906v284.615077c0 30.09958 24.366327 54.465907 54.465906 54.465907 30.09958 0 54.465907-24.366327 54.465907-54.465907z" /> - - diff --git a/Plain Craft Launcher 2/Pages/PageOther/PageOtherLeft.xaml.vb b/Plain Craft Launcher 2/Pages/PageOther/PageOtherLeft.xaml.vb index ffa5a72..59df742 100644 --- a/Plain Craft Launcher 2/Pages/PageOther/PageOtherLeft.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageOther/PageOtherLeft.xaml.vb @@ -125,7 +125,12 @@ End Sub '打开网页 - Public Shared Sub TryFeedback() Handles ItemFeedback.Click + Private Sub TryFeedback(sender As Object, e As RouteEventArgs) Handles ItemFeedback.Changed + If Not ItemFeedback.Checked Then Exit Sub + TryFeedback() + e.Handled = True + End Sub + Public Shared Sub TryFeedback() If Not CanFeedback(True) Then Exit Sub Select Case MyMsgBox("在提交新反馈前，建议先搜索反馈列表，以避免重复提交。" & vbCrLf & "如果无法打开该网页，请尝试使用加速器或 VPN。", "反馈", "提交新反馈", "查看反馈列表", "取消") @@ -135,7 +140,12 @@ OpenWebsite("https://github.com/Hex-Dragon/PCL2/issues/") End Select End Sub - Public Shared Sub TryVote() Handles ItemVote.Click + Private Sub TryVote(sender As Object, e As RouteEventArgs) Handles ItemVote.Changed + If Not ItemVote.Checked Then Exit Sub + TryVote() + e.Handled = True + End Sub + Public Shared Sub TryVote() If MyMsgBox("是否要打开新功能投票网页？" & vbCrLf & "如果无法打开该网页，请尝试使用加速器或 VPN。", "新功能投票", "打开", "取消") = 2 Then Exit Sub OpenWebsite("https://github.com/Hex-Dragon/PCL2/discussions/categories/%E5%8A%9F%E8%83%BD%E6%8A%95%E7%A5%A8?discussions_q=category%3A%E5%8A%9F%E8%83%BD%E6%8A%95%E7%A5%A8+sort%3Adate_created") diff --git a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb index 444fc8a..6dbe50c 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb @@ -203,15 +203,19 @@ '加载状态：0/未读取 1/已读取未处理 2/已处理 Public State As Byte = 0 - Public Type + Public Type As Type Public Sub New(Value, Optional Source = SetupSource.Normal, Optional Encoded = False) - Me.DefaultValue = Value - Me.DefaultValueEncoded = If(Encoded, SecretEncrypt(Value, "PCL" & UniqueAddress), Value) - Me.Encoded = Encoded - Me.Value = Value - Me.Source = Source - Type = If(Value, New Object).GetType + Try + Me.DefaultValue = Value + Me.Encoded = Encoded + Me.Value = Value + Me.Source = Source + Me.Type = If(Value, New Object).GetType + Me.DefaultValueEncoded = If(Encoded, SecretEncrypt(Value, "PCL" & UniqueAddress), Value) + Catch ex As Exception + Log(ex, "初始化 SetupEntry 失败", LogLevel.Feedback) '#5095 的 fallback + End Try End Sub End Class @@ -313,6 +317,12 @@ Dim E As SetupEntry = SetupDict(Key) [Set](Key, E.DefaultValue, E, ForceReload, Version) End Sub + ''' + ''' 获取某个设置项的默认值。 + ''' + Public Function GetDefault(Key As String) As String + Return SetupDict(Key).DefaultValue + End Function Private Sub Read(Key As String, ByRef E As SetupEntry, Version As McVersion) Try diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml index bb07693..8b692a4 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml @@ -220,7 +220,7 @@ - + @@ -232,8 +232,13 @@ - - + + + + diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.vb b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.vb index 6567b4e..a30267b 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.vb @@ -214,7 +214,7 @@ If(RamGame <> RamGameActual, " (可用 " & If(RamGameActual = Math.Floor(RamGameActual), RamGameActual & ".0", RamGameActual) & " GB)", "") LabRamUsed.Text = If(RamUsed = Math.Floor(RamUsed), RamUsed & ".0", RamUsed) & " GB" LabRamTotal.Text = " / " & If(RamTotal = Math.Floor(RamTotal), RamTotal & ".0", RamTotal) & " GB" - LabRamWarn.Visibility = If(RamGame = 1 AndAlso Not JavaIs64Bit() AndAlso Not Is32BitSystem AndAlso Not JavaList.Count = 0, Visibility.Visible, Visibility.Collapsed) + LabRamWarn.Visibility = If(RamGame = 1 AndAlso Not JavaIs64Bit() AndAlso Not Is32BitSystem AndAlso JavaList.Any, Visibility.Visible, Visibility.Collapsed) If ShowAnim Then '宽度动画 AniStart({ @@ -573,6 +573,15 @@ PreFin: CheckAdvanceRunWait.Visibility = If(TextAdvanceRun.Text = "", Visibility.Collapsed, Visibility.Visible) End Sub + 'JVM 参数重设 + Private Sub TextAdvanceJvm_TextChanged() Handles TextAdvanceJvm.ValidatedTextChanged + BtnAdvanceJvmReset.Visibility = If(TextAdvanceJvm.Text = Setup.GetDefault("LaunchAdvanceJvm"), Visibility.Hidden, Visibility.Visible) + End Sub + Private Sub BtnAdvanceJvmReset_Click(sender As Object, e As EventArgs) Handles BtnAdvanceJvmReset.Click + Setup.Reset("LaunchAdvanceJvm") + Reload() + End Sub + #End Region End Class diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml index d3d32a3..bf1c1da 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml @@ -78,9 +78,8 @@ - + diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml index e619cc7..0e2f912 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml @@ -72,10 +72,10 @@ - + - - + + @@ -225,6 +225,7 @@ + @@ -247,6 +248,7 @@ + diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb index 7773249..f48e8ea 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb @@ -452,10 +452,10 @@ Refresh: End If End If End Sub - Private Sub LabLauncherTheme8Copy_MouseRightButtonUp() Handles LabLauncherTheme8Copy.MouseRightButtonUp + Private Sub LabLauncherTheme8Copy_MouseRightButtonUp() Handles LabLauncherTheme8Copy.MouseRightButtonUp, RadioLauncherTheme8.MouseRightButtonUp OpenWebsite("https://afdian.com/a/LTCat") End Sub - Private Sub LabLauncherTheme9Copy_MouseRightButtonUp() Handles LabLauncherTheme9Copy.MouseRightButtonUp + Private Sub LabLauncherTheme9Copy_MouseRightButtonUp() Handles LabLauncherTheme9Copy.MouseRightButtonUp, RadioLauncherTheme9.MouseRightButtonUp PageOtherLeft.TryFeedback() End Sub @@ -675,24 +675,26 @@ Refresh: SliderLauncherOpacity.GetHintText = Function(v) Math.Round(40 + v * 0.1) & "%" SliderLauncherHue.GetHintText = Function(v) v & "°" SliderLauncherSat.GetHintText = Function(v) v & "%" - SliderLauncherDelta.GetHintText = Function(Value As Integer) - If Value > 90 Then - Return "+" & (Value - 90) - ElseIf Value = 90 Then - Return 0 - Else - Return Value - 90 - End If - End Function - SliderLauncherLight.GetHintText = Function(Value As Integer) - If Value > 20 Then - Return "+" & (Value - 20) - ElseIf Value = 20 Then - Return 0 - Else - Return Value - 20 - End If - End Function + SliderLauncherDelta.GetHintText = + Function(Value As Integer) + If Value > 90 Then + Return "+" & (Value - 90) + ElseIf Value = 90 Then + Return 0 + Else + Return Value - 90 + End If + End Function + SliderLauncherLight.GetHintText = + Function(Value As Integer) + If Value > 20 Then + Return "+" & (Value - 20) + ElseIf Value = 20 Then + Return 0 + Else + Return Value - 20 + End If + End Function SliderBackgroundOpacity.GetHintText = Function(v) Math.Round(v * 0.1) & "%" SliderBackgroundBlur.GetHintText = Function(v) v & " 像素" End Sub diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml index 854458e..d00296d 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml @@ -16,11 +16,13 @@ + - - - - + + + + + @@ -37,10 +39,19 @@ - + - - + + + + + + + + + + + diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb index fb7e3ae..459a65b 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb @@ -46,6 +46,7 @@ '强制刷新 Try CompProjectCache.Clear() + CompFilesCache.Clear() File.Delete(PathTemp & "Cache\LocalMod.json") Log("[Mod] 由于点击刷新按钮，清理本地 Mod 信息缓存") Catch ex As Exception @@ -322,8 +323,65 @@ ''' ''' 安装 Mod。 ''' - Private Sub BtnManageInstall_Click(sender As Object, e As MouseButtonEventArgs) Handles BtnManageInstall.Click - Hint("将 Mod 文件直接拖入 PCL 窗口即可安装！") + Private Sub BtnManageInstall_Click(sender As Object, e As MouseButtonEventArgs) Handles BtnManageInstall.Click, BtnHintInstall.Click + Dim FileList = SelectFiles("Mod 文件(*.jar;*.litemod;*.disabled;*.old)|*.jar;*.litemod;*.disabled;*.old", "选择要安装的 Mod") + If Not FileList.Any Then Return + InstallMods(FileList) + End Sub + ''' + ''' 尝试安装 Mod。 + ''' 返回输入的文件是否为一个 Mod 文件，仅用于判断拖拽行为。 + ''' + Public Shared Function InstallMods(FilePathList As IEnumerable(Of String)) As Boolean + Dim Extension As String = FilePathList.First.AfterLast(".").ToLower + '检查文件扩展名 + If Not {"jar", "litemod", "disabled", "old"}.Any(Function(t) t = Extension) Then Return False + Log("[System] 文件为 jar/litemod 格式，尝试作为 Mod 安装") + '检查回收站：回收站中的文件有错误的文件名 + If FilePathList.First.Contains(":\$RECYCLE.BIN\") Then + Hint("请先将文件从回收站还原，再尝试安装！", HintType.Critical) + Return True + End If + '获取并检查目标版本 + Dim TargetVersion As McVersion = McVersionCurrent + If FrmMain.PageCurrent = FormMain.PageType.VersionSetup Then TargetVersion = PageVersionLeft.Version + If FrmMain.PageCurrent = FormMain.PageType.VersionSelect OrElse TargetVersion Is Nothing OrElse Not TargetVersion.Modable Then + '正在选择版本，或当前版本不能安装 Mod + Hint("若要安装 Mod，请先选择一个可以安装 Mod 的版本！") + ElseIf Not (FrmMain.PageCurrent = FormMain.PageType.VersionSetup AndAlso FrmMain.PageCurrentSub = FormMain.PageSubType.VersionMod) Then + '未处于 Mod 管理页面 + If MyMsgBox($"是否要将这{If(FilePathList.Count = 1, "个", "些")}文件作为 Mod 安装到 {TargetVersion.Name}？", "Mod 安装确认", "确定", "取消") = 1 Then GoTo Install + Else + '处于 Mod 管理页面 +Install: + Try + For Each ModFile In FilePathList + Dim NewFileName = GetFileNameFromPath(ModFile).Replace(".disabled", "") + If Not NewFileName.Contains(".") Then NewFileName += ".jar" '#4227 + CopyFile(ModFile, TargetVersion.PathIndie & "mods\" & NewFileName) + Next + If FilePathList.Count = 1 Then + Hint($"已安装 {GetFileNameFromPath(FilePathList.First).Replace(".disabled", "")}！", HintType.Finish) + Else + Hint($"已安装 {FilePathList.Count} 个 Mod！", HintType.Finish) + End If + '刷新列表 + If FrmMain.PageCurrent = FormMain.PageType.VersionSetup AndAlso FrmMain.PageCurrentSub = FormMain.PageSubType.VersionMod Then + LoaderFolderRun(McModLoader, TargetVersion.PathIndie & "mods\", LoaderFolderRunType.ForceRun) + End If + Catch ex As Exception + Log(ex, "复制 Mod 文件失败", LogLevel.Msgbox) + End Try + End If + Return True + End Function + + ''' + ''' 下载 Mod。 + ''' + Private Sub BtnManageDownload_Click(sender As Object, e As MouseButtonEventArgs) Handles BtnManageDownload.Click, BtnHintDownload.Click + PageDownloadMod.TargetVersion = PageVersionLeft.Version '将当前版本设置为筛选器 + FrmMain.PageChange(FormMain.PageType.Download, FormMain.PageSubType.DownloadMod) End Sub #End Region @@ -522,8 +580,8 @@ Public Shared UpdatingVersions As New List(Of String) Public Sub UpdateMods(ModList As IEnumerable(Of McMod)) '更新前警告 - If Not Setup.Get("HintUpdateMod") Then - If MyMsgBox($"新版本 Mod 可能不兼容老版本的存档或者其他 Mod，这可能导致游戏崩溃，甚至存档损坏！{vbCrLf}除非整合包作者要求你更新，否则不要私自更新整合包里的 Mod！{vbCrLf}在更新 Mod 前，请先备份存档，并检查它的更新日志！{vbCrLf}更新时，老版本的 Mod 会被移动到回收站，以防万一。{vbCrLf}{vbCrLf}请在认真阅读上述警告后再继续！", "Mod 更新警告", "我已了解上述风险，继续更新", "取消", IsWarn:=True) = 1 Then + If Not Setup.Get("HintUpdateMod") OrElse ModList.Count >= 15 Then + If MyMsgBox($"新版本 Mod 可能不兼容旧存档或者其他 Mod，这可能导致游戏崩溃，甚至永久损坏存档！{vbCrLf}如果你在游玩整合包，请千万不要自行更新 Mod！{vbCrLf}{vbCrLf}在更新前，请先备份存档，并检查 Mod 的更新日志。{vbCrLf}如果更新后出现问题，你也可以在回收站找回更新前的 Mod。", "Mod 更新警告", "我已了解风险，继续更新", "取消", IsWarn:=True) = 1 Then Setup.Set("HintUpdateMod", True) Else Exit Sub diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb index 0334a38..bc2ed25 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb @@ -173,7 +173,7 @@ If(RamGame <> RamGameActual, " (可用 " & If(RamGameActual = Math.Floor(RamGameActual), RamGameActual & ".0", RamGameActual) & " GB)", "") LabRamUsed.Text = If(RamUsed = Math.Floor(RamUsed), RamUsed & ".0", RamUsed) & " GB" LabRamTotal.Text = " / " & If(RamTotal = Math.Floor(RamTotal), RamTotal & ".0", RamTotal) & " GB" - LabRamWarn.Visibility = If(RamGame = 1 AndAlso Not JavaIs64Bit(PageVersionLeft.Version) AndAlso Not Is32BitSystem AndAlso Not JavaList.Count = 0, Visibility.Visible, Visibility.Collapsed) + LabRamWarn.Visibility = If(RamGame = 1 AndAlso Not JavaIs64Bit(PageVersionLeft.Version) AndAlso Not Is32BitSystem AndAlso JavaList.Any, Visibility.Visible, Visibility.Collapsed) If ShowAnim Then '宽度动画 AniStart({ @@ -491,6 +491,7 @@ PreFin: Private IsReverting As Boolean = False Private Sub ComboArgumentIndie_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles ComboArgumentIndie.SelectionChanged If AniControlEnabled <> 0 Then Exit Sub + If IsReverting Then Exit Sub If MyMsgBox("调整版本隔离后，你可能得把游戏存档、Mod 等文件手动迁移到新的游戏文件夹中。" & vbCrLf & "如果修改后发现存档消失，把这项设置改回来就能恢复。" & vbCrLf & "如果你不会迁移存档，不建议修改这项设置！", diff --git a/Plain Craft Launcher 2/Resources/Help.zip b/Plain Craft Launcher 2/Resources/Help.zip index 972bf25..6a3b014 100644 Binary files a/Plain Craft Launcher 2/Resources/Help.zip and b/Plain Craft Launcher 2/Resources/Help.zip differ diff --git a/Plain Craft Launcher 2/Resources/ModData.txt b/Plain Craft Launcher 2/Resources/ModData.txt index 69e47c2..a44a30e 100644 --- a/Plain Craft Launcher 2/Resources/ModData.txt +++ b/Plain Craft Launcher 2/Resources/ModData.txt @@ -17,7 +17,7 @@ powerconverters-portablejims-fork|能源转换 (PowerConverters) modular-forcefield-system|模块化力场系统* minechem-recompile|化学 (MineChem) - 非官方重编译版¨73373|化学 (MineChem) - 已失效 -iron-chests@cyberanner-ironchest|更多箱子*¨iron-chests-for-fabric|更多箱子 (Iron Chests)¨iron-chests-fabric@|更多箱子 (Iron Chests) +iron-chests@|更多箱子*¨iron-chests-for-fabric@cyberanner-ironchest|更多箱子 (Iron Chests)¨iron-chests-fabric@|更多箱子 (Iron Chests) balkons-weaponmod|更多武器 (Balkon's WeaponMod) advanced-machines|高级机械 (AdvancedMachines) advanced-solar-panels|高级太阳能* @@ -175,8 +175,8 @@ extracells2|更多存储单元2 (Extra Cells 2) billund-223258|乐高 (Billund) -alchemyplusplus|炼金++ (Alchemy++) -better-bows|更好弓箭系统 (Better Archery Mod) +alchemyplusplus|炼金++ (AlchemyPlusPlus) +better-bows|更好弓箭系统 (Better Archery) mumblelink|Mumble语音链接* ender-io@enderio|末影接口 (Ender IO) @@ -475,7 +475,7 @@ more-swords-mod|更多剑 (MoreSwords) thaumic-bases|神秘基础学*¨thaumic-bases-unofficial|神秘基础学 (Thaumic Bases) essentialcraft-3|源质魔法3 (EssentialCraft 3) -hardcore-questing-mode|困难任务* +hardcore-questing-mode@hqm|困难任务* unidict|矿辞统一 (UniDict) thermal-dynamics@|热动力学* zoology|动物学* @@ -672,7 +672,7 @@ real-time-chat-translation-mod|实时聊天翻译* practical-logistics-2|实用物流监控2* energyadditions|高级能源 (EnergyAdditions) -advanced-generators|高级发电机* +advanced-generators@|高级发电机* bdlib pressure-pipes|压力管道* @@ -789,7 +789,7 @@ simple-void-world|简单虚空世界* shetiphiancore@¨shetiphiancore-fabric shadowmc scannable@|扫描器* -rebornstorage|存储重置 (Reborn Storage) +rebornstorage@|存储重置 (Reborn Storage) quantumstorage|量子存储 (QuantumStorage) p455w0rds-library mtlib @@ -831,7 +831,7 @@ teletoro|远程传送 (TeleToro) re-zero-kara-hajimeru-isekai-seikatsu|RE:从零开始的异世界 (Re: Zero kara hajimeru isekai seikatsu) minewatch thaumcraft-inventory-scanning|神秘时代物品栏扫描* -cyclic|循环* +cyclic@|循环* redstoneplusplus|红石++ (Redstone++) ctm|连接纹理 (ConnectedTexturesMod) @@ -962,7 +962,7 @@ solar-expansion blue-power|蓝石力量 (Blue power) redstone-armory|红石军械库* qmunitylib - +quest-for-blue-name the-last-smith|最后的太刀匠人* mineamp|我的音乐 (MineAmp) quiverbow|Quiver Bow - 官方原版¨quiverbow-restrung|Quiver Bow - 重制版 @@ -972,7 +972,7 @@ meecreeps@|使命必达先生 (MeeCreeps) streams|溪流* blockcraftery|方块工匠* -bedrockores|基岩矿簇 (Bedrock Ores) +bedrockores@|基岩矿簇 (Bedrock Ores) chat-bubbles|聊天泡泡* refined-storage-addons@|精致存储附属* foamfix-optimization-mod@foamfix|泡沫修复 (FoamFix) @@ -1005,7 +1005,7 @@ the-autologin-mod-for-authme-server|自动登录 (AutoLogin) ROOST|鸡窝 (Roost) croparia@|矿石作物/魔种之咏* simple-corn|简单玉米* -thaumic-jei +thaumic-jei@ tinkers-steelworks|匠魂炼钢厂 (Tinkers' Steelworks) unicode-font-extension|Unicode 字体扩展* placeable-items|可放置物品* @@ -1119,7 +1119,7 @@ lambda-craft|半条命 (LambdaCraft) vivecraft@¨vivecraft-forge-extensions super-sound-muffler|超级消音器* armorplus@|装备扩充 (ArmorPlus) -inspirations|灵感* +inspirations@|灵感* tree-growing-simulator|跳舞树成长* personal-cars @@ -1169,7 +1169,7 @@ inventory-crafting-grid|背包工作台* kleeslabs@|更好地破坏半砖 (KleeSlabs)¨kleeslabs-fabric|更好地破坏半砖 (KleeSlabs) gregtechce|格雷科技社区版 (GregTech Community Edition) -blur@blur-fabric|界面背景模糊*¨blur-fabric|界面背景模糊 (Blur) +blur@blur-plus|界面背景模糊*¨blur-fabric|界面背景模糊 (Blur) fast-leaf-decay|树叶快速腐烂* enable-cheats|开启作弊模式* findit|找到它 (Findit!) @@ -1213,7 +1213,7 @@ in-game-account-switcher@|游戏内账号切换 (In-Game Account Switcher) consecration@|圣化* ignite-hud|燃点HUD (Ignite HUD) mrcrayfishs-gun-mod|MrCrayfish的枪 (MrCrayfish's Gun Mod) -bloodmoon|血月 (bloodmoon) +bloodmoon|血月* obfuscate runic-dungeons|符文地牢 (Runic Dungeon) poop|屎 (Poop Mod) @@ -1243,7 +1243,7 @@ the-mists-of-riov|神秘世界 (The Mists of RioV Mod) nsr-no-respawn-screen|无重生屏幕 (No Respawn Screen) more-bees|蜜蜂拓展* evilnotchlib -tpalette|调色板 (TPalette) +tpalette-forge|调色板 (TPalette)¨tpalette|调色板 (TPalette) - 文件覆盖 career-bees|职业蜜蜂* @@ -1436,7 +1436,7 @@ new-tardis-mod advanced-chimneys|高级烟囱* regeneration|神秘博士 - 再生 (Doctor Who - Regeneration​) -more-planets-gc-addon +stevekungs-lib make-zoom-zoom|更快的加载 (MakeZoomZoom) minecraft-virtual-machines|Minecraft虚拟机* cavern2|洞穴 II (Cavern II) @@ -1698,7 +1698,7 @@ huajiage-infinite-galaxy|滑稽纪元II:无尽星河 (Huaji Age II:Infinite Gala cqrepoured|寻找巧克力重铸版 (Chocolate Quest Repoured) fabricproxy@|Fabric 群组支持 (FabricProxy) ex-sartagine|锅具* -xaeros-minimap@|Xaero的小地图 (Xaero's Minimap) - 完整版¨xaeros-minimap-fair-play-edition@xaeros-minimap-fair|Xaero的小地图 (Xaero's Minimap) - 公平竞争版 +xaeros-minimap|Xaero的小地图 (Xaero's Minimap) - 默认版（功能完整）¨xaeros-minimap-fair-play-edition|Xaero的小地图 (Xaero's Minimap) - 公平竞争版（功能部分缺失）¨@xaeros-minimap|Xaero的小地图 (Xaero's Minimap) - 完整版¨@xaeros-minimap-fair|Xaero的小地图 (Xaero's Minimap) - 公平竞争版 everlastingabilities-potioncore|永恒能力-药水核心 (EverlastingAbilities-PotionCore) optifabric the-emerald-haven|翡翠天堂* @@ -1959,7 +1959,7 @@ iron-chest-minecarts|更多箱子矿车* nether-chest|下界箱子* mob-kill-messages|击杀信息通知* -betterdispenser|能喂食的发射器 (Better Dispenser) +betterdispenser|能喂食的发射器 (BetterDispenser) shulkerboxdisplay|潜影盒显示器 (ShulkerBoxDisplay) mycommands|我的命令 (MyCommands) @@ -2037,7 +2037,7 @@ modular-magic|模块化魔法* magic-kingdoms-mod|魔法王国 (Magic Kingdoms Mod/Schools of Magic Mod) zollern-galaxy|卓伦星系* -macaws-bridges|Macaw的桥梁 (Macaw's Bridges) +macaws-bridges@|Macaw的桥梁 (Macaw's Bridges) trample-stopper|防止踩踏*¨trample-stopper-fabric|防止踩踏 (Trample Stopper) macaws-roofs@|Macaw的屋顶 (Macaw's Roofs) @@ -2135,7 +2135,7 @@ arcanum|奥秘* random-enchants|随机附魔* much-more-spiders-v2|更多种类的蜘蛛 (Much More Spiders) compressed-items -no-tree-punching|无树可撸* +no-tree-punching@|无树可撸* harvest-festival-legacy|丰收物语移植版* friendlymobs|友好的怪物 (FriendlyMobs) simplecore-api@|简单前置 (SimpleCore API) @@ -2346,7 +2346,7 @@ fishs-undead-rising|Fish的不死崛起/Fish的亡灵崛起 (Fish's Undead Risin cloth-config@ just-map too-realistic-inventory|真实背包 (Realistic Inventory) -mob-farm|生物农场 (Mob farm) +mob-farm|生物农场* acceleratorcraft|加速器工艺 (AcceleratorCraft) minecraft-spongebob-squarepants-mod-for-the-1-7-10 utility-worlds|实用世界* @@ -2570,8 +2570,8 @@ angrysun|炙热太阳 (AngrySun) its-not-long-enough|与现实相同的昼夜交替 (It's Not Long Enough) sunscreen-gel|防晒霜* muya1-7-10|姆亚核心 (MuyaCore) -macaws-furniture|Macaw的家具 (Macaw's Furniture) -macaws-doors|Macaw的门 (Macaw's Doors) +macaws-furniture@|Macaw的家具 (Macaw's Furniture) +macaws-doors@|Macaw的门 (Macaw's Doors) blueprint@ geyser-mod not-enough-pets@|更多宠物* @@ -2751,7 +2751,7 @@ mobs-attempt-parkour@ identity|化身*¨identity-on-forge|化身 (Identity) industrial-revolution@|工业革命* art-of-alchemy|炼金艺术 (Art of Alchemy) -lan-server-properties|自定义局域网联机* +lan-server-properties@|自定义局域网联机* immersive-intelligence@|沉浸智能* analyzeio @@ -2835,7 +2835,7 @@ rustic-thaumaturgy|神秘乡村* thallium|铊* haema@ evil-ores -unsuspicious-stew|炖菜解谜/炖菜效果显示* +unsuspicious-stew@|炖菜解谜/炖菜效果显示* tfc-seasonal imblockerfabric@imblocker|输入法冲突修复 (IMBlockerFabric) saomclib @@ -2915,7 +2915,7 @@ costumes|服装* eyemod-phone upgrade-aquatic@|碧海新生* tfc-ambiental -macaws-trapdoors|Macaw的活板门 (Macaw's Trapdoors) +macaws-trapdoors@|Macaw的活板门 (Macaw's Trapdoors) zenutil better-beacon-effect|更好的信标效果* @@ -2967,14 +2967,14 @@ time-to-live dual-hotbar-1-12-2|双重快捷栏1.12.2 (Dual Hotbars 1.12.2) cha-s|可合成的马铠和鞍 (Craftable Horse Armour & Saddle) dual-hotbar|双重快捷栏 (Dual Hotbars) -travellers-boots +travellers-boots@ cofh-vanilla-satchels betteranimalsplus|更多动物 (Better Animals Plus) packagedauto@|封包合成 (PackagedAuto) packagedexcrafting@|封包合成拓展 (PackagedExCrafting) -compactstorage|紧凑存储 (compactstorage)¨@compact_storage|紧凑存储 (compactstorage) - 已失效 +compactstorage@compact-storage|紧凑存储 (compactstorage) useful-backpacks@|实用背包* conquest-reforged@|征服者* steelseries-gamesense @@ -3508,7 +3508,7 @@ emotecraft@|表情工艺*¨emotecraft-forge|表情工艺 (Emotecraft) pattysmorestuff@ hats|帽子* smoother-bedrock|平滑基岩层* -c2me-fabric@|C^2M 引擎 (C^2M-Engine/Concurrent Chunk Management Engine) +c2me-fabric@|C^2M 引擎 (C^2M-Engine/Concurrent Chunk Management Engine)¨@c2me-neoforge|C^2M 引擎 (C^2M-Engine/Concurrent Chunk Management Engine) datapack-anvil nuclear-science@|核科学* glaretorch|强光火把 (Glare Torch) @@ -3578,7 +3578,7 @@ simple-drawers|简单的抽屉* charmonium¨charmonium-reforged@charmonium xnicex@ krate -chickensshed|鸡棚重置版 (ChickensShed) +chickensshed@|鸡棚重置版 (ChickensShed) chickenshed expanded-storage@|扩展存储*¨expanded-storage-fabric|扩展存储 (Expanded Storage)¨expanded-storage-forge|扩展存储 (Expanded Storage) project-mmo@ @@ -3598,7 +3598,7 @@ simply-tea|简单的茶！ (Simply Tea!) buttermilk diet@|均衡饮食* brazilian-fields|巴西风情* -ae2-extras|AE2附加 (AE2 Extras) +ae2-extras|AE2 附加 (AE2 Extras) animalium|动物* mob-origins@moborigins|生物起源* better-default-biomes|更好的默认生物群系* @@ -3612,7 +3612,7 @@ mc-modsurement@allurement! dwarf-miner-totem|矮人矿工* yungs-better-portals|YUNG 的传送门机制重构 (YUNG's Better Portals) german-road-signs-mod|德国交通标志* -iguana-in-a-blanket|真实调整 (Iguana in a Blanket) +iguana-in-a-blanket@iguana|真实调整 (Iguana in a Blanket) anthill-inside|蚂蚁物流* nei-integration uncrafting-grinder|分解磨床* @@ -3663,7 +3663,7 @@ wool-temples@|羊毛神殿* exp-bottling|经验装瓶 (EXP Bottling) buildersaddition@ gt-remastered|格雷科技重制版 (GT: Remastered) -tips|提示* +tips@|提示* Interactio advancement-book|进度之书* drawers-tooltip|抽屉提示* @@ -3736,13 +3736,13 @@ engineers-workshop-reborn crimson-xp-charm|经验护符 (Crimson XP) locatebiome enderman-evolution -sophisticated-backpacks|精妙背包* +sophisticated-backpacks@|精妙背包* age-of-exile whoosh gregtech-intergalactical|泛银河系格雷科技 (GregTech Intergalactical) catalogue|模组目录*¨catalogue-fabric|模组目录 (Catalogue) libblockattributes -balance-of-exile + dungeons-of-exile lots-more-food-forge@lots-more-food¨lots-more-food-fabric @@ -3776,7 +3776,7 @@ flower-seeds astemirs-forest-craft astromine-foundations|天体矿工：基础 (Astromine: Foundations) -create-stuff-additions@|机械动力：物品附加 (Create Stuff & Additions) +create-stuff-additions|机械动力：物品附加 (Create Stuff & Additions)¨@create-stuff-additions|机械动力：物品附加 (Create Stuff & Additions) - 未及时更新 slab-machines|台阶型设备* more-create-stuffs|更多机械动力物品* rsinfinitybooster|RS 无限范围增幅卡 (RSInfinityBooster) @@ -3887,7 +3887,7 @@ tis-3d@tis3d entity-nan-health-fix|假死修复 (Entity NaN Health Fix) ferritecore@ferrite-core|铁氧体磁芯 (FerriteCore)¨ferritecore-fabric|铁氧体磁芯 (FerriteCore) thaumcraft-research-patcher -masterful-machinery +masterful-machinery@ minecraft-earth-mod|Derec 的地球生物 (Derec's Earth Mobs) scotts-essential drawerfps|储物抽屉渲染配置 (DrawerFPS) @@ -4087,7 +4087,7 @@ fps-reducre-for-fabric|FPS减速器（Fabric） (FPS Reducer (For Fabric)) art-artillery|艺术？火炮！ (Art? Artillery!) minemenufabric@|我的菜单 Fabric 版 (MineMenuFabric) @tabtps -afkpeace@ +afkpeace|AFKPeace - 停止更新¨@afkpeace smooth-chunks|平滑区块加载*¨@smooth-chunks|平滑区块加载 (Smooth Chunks) - 已失效 @@ -4172,7 +4172,7 @@ tool-progression|工具进阶* a-paimon|派蒙* - +@bh-creative music-maker-mod penguin-lib flywheel@|飞轮* @@ -4218,7 +4218,7 @@ tfc-medicinal water-flasks structure-world -macaws-lights-and-lamps|Macaw的灯 (Macaw's Lights and Lamps) +macaws-lights-and-lamps@|Macaw的灯 (Macaw's Lights and Lamps) terrarian-slimes@ create-gears|机械动力：齿轮附加* simple-big-backpack @@ -4296,7 +4296,7 @@ superhotmc bag-of-yurting@|帐篷袋 (Bag of Yurting) better-combat-rebirth|更好的战斗：重生* iron-and-gold-from-1-17|来自 1.17 的铁和金 (iron and gold from 1.17) -immersive-cooking|沉浸烹饪* +immersive-cooking@|沉浸烹饪* structured-crafting random-shulker-colours@|随机潜影贝颜色*¨random-shulker-colours-fabric|随机潜影贝颜色 (Random Shulker Colours) create-automated @@ -4548,7 +4548,7 @@ better-furnaces-reforged@|更好的熔炉重铸版 (BetterFurnaces Reforged) schools-of-magic-second-semester|魔法学校：第二学期 (Schools of Magic: Second Semester) dark-loading-screen@|深色加载界面* -hals-exploration-mod +hals-exploration-mod@hals%20exploration%20mod farmers-delight-cookbook-addon|农夫乐事：烹饪书拓展 (Farmer's Delight Cookbook Addon) heads-down-display@head-down-display mrcrayfish-more-furniture-mod|MrCrayfish 的更多家具 (MrCrayfish's More Furniture Mod) @@ -4591,7 +4591,7 @@ detail-armor-bar-forge@detail-armor-bar|细节盔甲 (Detail Armor Bar)¨detail- wings-horns-hooves-the-ultimate-unicorn-mod project-rankine@rankine|兰金计划* tinkers-mechworks@ -qdc-quantum-dis-assembly-craft|量子拆解工艺 (Quantum Dis-Assembly Craft) +qdc-core-4-0@qdc-core-4.0|量子拆解工艺 (Quantum Dis-Assembly Craft)¨qdc-quantum-dis-assembly-craft|量子拆解工艺 (Quantum Dis-Assembly Craft) - 旧 william-wythers-overhauled-overworld@wwoo¨expanded-ecosphere@ infinite-music cobbler|可靠的潜影贝工厂 (Shulker's Faithful Factories/Cobbler) @@ -4649,7 +4649,7 @@ maidens-marvelous-materials nekoration@|猫咪装饰* tomb-many-graves-2 fins-and-tails|鳍和尾巴 (Fins and Tails) -smarter-farmers-farmers-replant@|更聪明的农夫 (Smarter Farmers/Farmers Replant) +smarter-farmers-farmers-replant@|更聪明的农夫 (Smarter Farmers / Farmers Replant) peculiars|独特风味* draggable-resource-packs@draggable-lists|可拖动列表/可拖动资源包 (Draggable Lists/Draggable Resource Packs) fastchest|快速箱子渲染 (FastChest) - 已不再更新¨@fastchest|快速箱子渲染 (FastChest) - 在此处更新 @@ -4816,7 +4816,7 @@ hourglass@|沙漏* relics-mod@|遗物 (Relics) comfortable-nether|舒适下界* arcanecraft-ii|奥法工艺2 (ArcaneCraft II) -presence-footsteps-forge|脚步声Forge版 (Presence Footsteps (Forge)) +presence-footsteps-forge@resence-footsteps-forge|脚步声Forge版 (Presence Footsteps (Forge)) aardvarks-weird-wonderful-wild @@ -4848,7 +4848,7 @@ dark-caverns|暗黑深穴* -milk-all-the-mobs¨milk-all-the-mobs-fabric +milk-all-the-mobs@¨milk-all-the-mobs-fabric roadrunner pokecube-aoi grim-statues|Grim的雕像* @@ -4878,7 +4878,7 @@ ex-nihilo-random|无中生有：随想 (Ex Nihilo: Random) fabrictailor|离线皮肤切换 (Fabric Tailor) ambientworld - +@custom-raid|自定义袭击 (Custom Raid) apple-trees-revived|苹果树：复生* potatos-lucky-block|马铃薯幸运方块 (Potato's Lucky block) even-more-tnt @@ -5141,7 +5141,7 @@ refined-relocation-2|简单分类2* ftb-sluice sky-villages-forge@sky-villages|天空村庄 (Sky Villages)¨sky-villages-fabric|天空村庄 (Sky Villages) gui-clock@¨gui-clock-fabric-version -hand-over-your-items¨hand-over-your-items-fabric +hand-over-your-items@¨hand-over-your-items-fabric koopas-critters krypton-reforged|氪Forge版* item-counter|物品计数器* @@ -5196,7 +5196,7 @@ more-respawn-anchors|更多重生锚*¨more-respawn-anchors-forge|更多重生 werewolves-become-a-beast@werewolves|狼人 (Werewolves) omnipotent-card@|万用卡牌* -does-it-tick +does-it-tick@ public-gui-announcement|公开GUI显示* wet-lava-sponge ripples-of-the-past¨@ripples-of-the-past|Ripples of the Past - 最新版(包括公开测试版) @@ -5298,7 +5298,7 @@ mythicmetals@|神话金属 (Mythic Metals) creeper-firework@|烟花苦力怕* second-chance@second-chance-forge¨second-chance-forge promenade@ -london-underground@the-tube|伦敦地铁 (The London Underground) +london-underground@the-tube|伦敦地铁 (MTR London Underground Addon) dynamiclights-reforged@sodium-dynamic-lights|钠/Embeddium：动态光源 (Sodium/Embeddium Dynamic Lights) the-wild-mod@|荒野更新* tuff-depth|凝灰岩深度* @@ -5308,7 +5308,7 @@ framework¨framework-fabric anointed-items -golden-age-combat|黄金时代的战斗* +golden-age-combat@|黄金时代的战斗* magnesium-extras|钠/Embeddium：附属 (Sodium/Embeddium Extras) - 全部¨@sodium-extras|钠/Embeddium：附属 (Sodium/Embeddium Extras) chest-tracker@|箱子追踪* advancementinfo@|进度信息展示 (AdvancementInfo) @@ -5324,7 +5324,7 @@ speedrunigt@ archmagus slimyboyos@ fireplace-lib@¨fireplace-lib-forge -immersive-geology|沉浸地质学* +immersive-geology@|沉浸地质学* wool-tweaks@|羊毛调整*¨wool-tweaks-fabric|羊毛调整 (Wool Tweaks) tools-complement@ adventtic @@ -5345,17 +5345,17 @@ eggtab-fabric|独立刷怪蛋列表 (Egg Tab)¨eggtab-forge|独立刷怪蛋列 always-a-wither-skull@|必得凋灵骷髅头颅 (Always a Wither Skull)¨always-a-wither-skull-fabric|必得凋灵骷髅头颅 (Always a Wither Skull) anvil-restoration@|铁砧修复*¨anvil-restoration-fabric|铁砧修复 (Anvil Restoration) hide-hands-fabric@hide-hands|隐藏主副手 (Hide Hands)¨hide-hands|隐藏主副手* -better-beacon-placement-fabric@better-beacon-placement|更好的信标放置 (Better Beacon Placement)¨better-beacon-placement|更好的信标放置* +better-beacon-placement@|更好的信标放置*¨better-beacon-placement-fabric|更好的信标放置 (Better Beacon Placement) dead-totems functional-storage@|功能性存储* the-wild-update|荒野更新 1.19 (The Wild Update 1.19) archeology@|考古学 (CapsLock Archeology) -trinkets-and-baubles|饰品与小玩意 (Trinkets and Baubles) +trinkets-and-baubles@|饰品与小玩意 (Trinkets and Baubles) rope-ladders|绳梯* skewers-updated|烤串更新版* -keep-my-soil-tilled-fabric|保持肥沃 (Keep My Soil Tilled)¨keep-my-soil-tilled|保持肥沃* +keep-my-soil-tilled@|保持肥沃*¨keep-my-soil-tilled-fabric|保持肥沃 (Keep My Soil Tilled) double-doors@|双开门*¨double-doors-fabric|双开门 (Double Doors) expanded-armor-enchanting@|盔甲附魔扩展* expanded-weapon-enchanting@|武器附魔扩展* @@ -5371,7 +5371,7 @@ leap@ cameraoverhaul@ enchantment-id-extender@eide creeper-overhaul@|苦力怕改革/苦力怕革新* -cool-elytra-roll +cool-elytra-roll@ camera-overhaul-forge blame¨blame-fabric patboxs-banhammer@banhammer @@ -5416,7 +5416,7 @@ customnpc-plus@|自定义NPC+ (CustomNPC+) ingredient-extension-api@ wireless-networks -compass-manhunt +compass-manhunt@ exlines-furniture@ tinkers-archery|工匠箭术 (Tinkers' Archery) designer-modeling|设计师建模* @@ -5495,7 +5495,7 @@ mcdw@|我的世界：地下城武器 (MC Dungeons Weapons) beta-creepers -macaws-paintings|Macaw的画 (Macaw's Paintings) +macaws-paintings@|Macaw的画 (Macaw's Paintings) dyenamics multi-piston blood-magic@|血魔法* @@ -5604,7 +5604,7 @@ botany-pots-ore-planting@|植物盆栽矿石种植* satin-api@ easy-magic@|简易附魔台* -enlightend¨@enlightened-end|Enlightend/Enlightened End/Nourished End - 已失效¨@enlightend|Enlightend/Enlightened End/Nourished End - 未失效 +enlightend@|末地启明 (Enlightend/Enlightened End/Nourished End) rubidium@|铷* cultural-delights@|多元乐事* @@ -5682,7 +5682,7 @@ power-utilities-remastered|能源转换重制* create-gear-addon gun-mod-tl -energymeter +energymeter@ @headindex|头颅菜单 (Head Index) quantum-generators|量子发电机* simply-quarries|简易采石场* @@ -5775,7 +5775,7 @@ creatures-of-the-snow@creatures-from-the-snow-fabric|雪地里的生物！ (Crea collisions-lib@ wooled-boots@|羊毛靴子* zawa-evolved|野生动物园：进化 (Zoo and Wild Animals: Evolved) -bongo@ +bongo@|宾果游戏* impersonate@ calemi-core@ccore @@ -5823,7 +5823,7 @@ zettai-ars cant-sleep-clowns-will-eat-me@|夜不能寐 (Can't Sleep Clowns Will Eat Me) colony-cards|殖民地卡牌* autoharvest|自动收获 (AutoHarvest) -realistic-block-physics +realistic-block-physics@ domestication-innovation@|驯养革新* snuffles@|魄罗* flan-forge@flan¨flan @@ -5878,7 +5878,7 @@ robins-ruby-mod just-needed@justneeded¨just-needed-fabric nodami-remake|伤害免疫机制移除重制版 (NoDamIRemake) -had-enough-items|HEI物品管理器* +had-enough-items@|HEI物品管理器* worldinfo @bang block-helper@ @@ -5889,7 +5889,7 @@ gregicprobe travelers-index dimension-data-fix|维度数据修复* -gtce-bees +gtce-bees|GTCE 蜜蜂 (GTCE Bees) armory-expansion-bits-and-pieces @@ -6135,7 +6135,7 @@ the-binding-of-isaac-tears-mod humbling-bundle@|慈善捆绑包* grindstone-sharper-tools@¨grindstone-sharper-tools-fabric nutritious-milk@¨nutritious-milk-fabric|Nutritious Milk - 文件已失效 -extract-poison¨extract-poison-fabric +extract-poison@¨extract-poison-fabric zombie-villagers-from-spawner@¨zombie-villagers-from-spawner-fabric vine-climber healing-soup@¨healing-soup-fabric @@ -6159,7 +6159,7 @@ orcz sandwichable@ @shelve-refabricated mod-erate-loading-screen@moderate-loading-screen -shrink_ +shrink_@shrink cable-tiers jumbo-furnace@ no-villager-death-messages@ @@ -6217,7 +6217,7 @@ atm-additions extra-tags|额外标签* advancedchatlog@AdvancedChatLog crafting-station|合成站* -sons-of-sins@ +sons-of-sins@|七罪之子* advancedchathud@AdvancedChatHUD fuzes-relics chirpys-wildlife@wildlife-fabric @@ -6321,7 +6321,7 @@ colored-allays|染色悦灵* phantasm@ends-phantasm emerald-craft-mod@emerald-craft|绿宝石工艺* roughly-enough-professions-rep@|REI工作方块 (Roughly Enough Professions) -sophisticated-core|精妙核心* +sophisticated-core@|精妙核心* edibles@¨edibles-fabric reach-fix lootjs-forge @@ -6347,7 +6347,7 @@ illager-plushies¨illager-plushies-fabric pillageplunder extended-illagers-mod midnightcontrols@ -wonderful-enchantments +wonderful-enchantments@majruszs-enchantments a-lot-of-useless-stuff lankaster-origins @@ -6578,7 +6578,7 @@ better-block-sounds@bbs v0ids-smart-backpacks|V0id的智能背包 (V0id's Smart Backpacks) -winterly@ +winterly@|银装素裹* forgetmechunk@¨forgetmechunk-forge @moremusic @@ -6625,7 +6625,7 @@ zoomify@ golemania@ vulkanmod@ sledgehammer -quilt-loading-screen|Quilt加载画面* - 不再更新¨@quilt-loading-screen|Quilt加载画面 (Quilt Loading Screen) +quilt-loading-screen|Quilt 加载画面* - 不再更新¨@quilt-loading-screen|Quilt 加载画面 (Quilt Loading Screen) amethyst-imbuement@|紫晶魔艺* emi@ nuclear-contraptions @@ -6679,7 +6679,7 @@ keybinds@ hat-list@hatlist nmuk@ raven-brews-core -raven-coffee|Raven咖啡* +raven-coffee@raven-coffee-mod|Raven咖啡* cqc geode realistic-spiders|真实的蜘蛛* @@ -6708,7 +6708,7 @@ no-telemetry@ create-chromatic-return|机械动力：异彩化合物 (Create: Chromatic Return) coffee-spawner timber-mod@timber-mod-by-mycf -sophisticated-storage|精妙存储* +sophisticated-storage@|精妙存储* advanced-lootable-weapons what-the-bucket quickhomes @@ -7058,10 +7058,10 @@ endlessids@ @cpm-fabric|压缩空间 Fabric (Compact Machines - Fabric) cycle-paintings@¨cycle-paintings-fabric -fire-spread-tweaks¨fire-spread-tweaks-fabric +fire-spread-tweaks@¨fire-spread-tweaks-fabric anger-management easy-elytra-takeoff@¨easy-elytra-takeoff-fabric -stack-refill¨stack-refill-fabric +stack-refill@¨stack-refill-fabric light-meals@|轻食物语* lost-and-fished@lost-fished|失而钓得 (Lost and Fished) custom-backgrounds @@ -7090,7 +7090,7 @@ twigs@ -@fplib +fplib@ spongemixins¨@spongemixin1710 nock-enough-arrows every-compat@|泛用兼容：木材 (Every Compat: Wood Good) @@ -7172,7 +7172,7 @@ extrabotany2|额外植物学重置版 (ExtraBotany2) terramine@ aeinfinitybooster endertech-infinity|Endertech Infinity - 已失效¨@endertech-infinity -more-frogs-fabric|更多青蛙 (More Frogs) +more-frogs-fabric@morefrogs|更多青蛙 (More Frogs) create-big-cannons@|机械动力：火炮* @@ -7202,7 +7202,7 @@ another-furniture@|别样家具* rayon@ -ponder +ponder@ ender-logistics|末影物流* @@ -7415,7 +7415,7 @@ visible-toggle-sprint@ let-me-despawn@lmd glsl-panorama@ feyfriends@ -mccalc +mccalc@ nekeys crafted-forge¨crafted cursery @@ -7485,7 +7485,7 @@ shiny-horses@ nyx-rotn-edition playeranimator@ -apathy-mod +apathy-mod@apathy auudio-forge@auudio¨auudio-fabric easy-shulker-boxes@ @@ -7575,7 +7575,7 @@ spirit@ elytra-bounce@ no-report-button@nrb mana-wizardry -aileron +aileron@ @devworld immersive-weapons-compatibility-bridge @@ -8373,7 +8373,7 @@ mineterrariabosses biomes-in-jars-forge@biomes-in-jars|群系罐子 (Biomes in Jars)¨biomes-in-jars-fabric|群系罐子 (Biomes in Jars) @bocchitheblock craftable-potion-combinations@craftablepotioncombinations -polylib +polylib@ @creeper-fire-charge-fix|Creeper火焰弹修复 (Creeper Fire Charge Fix) tags-binder@ fastcaps @@ -8442,7 +8442,7 @@ re-ftbqkeys@|FTB任务本地化键：重置 (Re-FTBQLocalizationKeys) enchantment-sort|附魔排序* wrapfix|换行修复 (WrapFix) gem-crabs|宝石蟹* -create-rainbow-compound|机械动力：彩虹化合物 (Create: Rainbow Compound) +create-rainbow-compound@rainbowcompound|机械动力：彩虹化合物 (Create: Rainbow Compound) inmis-back-pack-mod-retextured thonkutil xp-storage@ @@ -8467,7 +8467,7 @@ treasure2-twilight-forest-loot-pack sanity-and-insanity crops-love-rain@ till-zombies-tear-us-apart -difficult-raids +difficult-raids@ gag bleach-awaken-by-deephantom15 @@ -8549,7 +8549,7 @@ codechickenlib-unofficial@ codechickencore-unofficial@|鸡块核心非官方版 (CodeChickenCore Unofficial) permafrost-biome -ambient-additions +ambient-additions@ambientadditions sweep|扫雷 (Minesweeper) sekclib @@ -8606,7 +8606,7 @@ shipping@ structureutils @cloudmusic|云音乐 (CloudMusic) i-like-wood -macaws-furnitures-biomes-o-plenty|Macaw的家具：超多生物群系附属 (Macaw's Furnitures - Biomes O' Plenty) +macaws-furnitures-biomes-o-plenty@|Macaw的家具：超多生物群系附属 (Macaw's Furnitures - Biomes O' Plenty) macaws-furnitures-oh-the-biomes-youll-go@|Macaw的家具：你将去的生物群系附属 (Macaw's Furnitures - Oh The Biomes You'll Go) armiger news-pillagers @@ -8820,7 +8820,7 @@ glacier-ice gtnhmixins@ dawn-to-dusk open-tower-defence@|开放式塔防* -mtr-station-decoration@station-decoration|MTR车站装饰 (MTR Station Decoration) +mtr-station-decoration@station-decoration|MTR车站装饰 (Station Decoration) perviaminvenire silverbirch@silver-birch @@ -8878,7 +8878,7 @@ even-more-creatures-mod eerie-entities better-weather-revived -rlcombat|更好的战斗-RLCraft版 (RLCombat) +rlcombat@|更好的战斗-RLCraft版 (RLCombat) botanical-addons @scoreboards-backup|计分板备份 (Scoreboards Backup) hodgepodge@ @@ -8894,7 +8894,7 @@ wizards@|魔法师* basketcase primal-lib biomes-youll-go-1-12-2-fixed|你将去的生物群系修复版 (Biomes You'll Go Fixed) -rune-crafting|符文 (Runes) +rune-crafting@runes|符文 (Runes) controlled-random leos-bosses|Leo的Boss (Leo's Bosses) leos-illagers @@ -8942,7 +8942,7 @@ ob-pandorica no-weather-effects@ ob-tooltips hekate-lib -loot-journal +loot-journal¨loot-journal-neoforge¨loot-journal-fabric @@ -8978,7 +8978,7 @@ monoblocks tinkers-things-json@tinkers-things|匠魂杂物 (Tinkers' Things) free-cam¨@freecam|Freecam - 无作弊版 workings@ -@mod-loading-screen +@mod-loading-screen|模组加载屏幕 (Mod Loading Screen) lucky-cases atmosfera feruchemy-allomancy|藏金术 (Feruchemy) @@ -9214,7 +9214,7 @@ tnt-breaks-bedrock@ from-the-north@ spruce-willis-the-xmas-tree@ sweet-potato-core-spc|地瓜核心 (Sweet Potato Core) -merge-enchantments +merge-enchantments@ turkey|火鸡* snowy-weaponry@ @@ -9384,8 +9384,8 @@ blood-and-stuff@ yungs-better-nether-fortresses@|YUNG的下界要塞优化 (YUNG's Better Nether Fortresses)¨yungs-better-nether-fortresses-fabric|YUNG的下界要塞优化 (YUNG's Better Nether Fortresses)¨yungs-better-nether-fortresses-neoforge|YUNG的下界要塞优化 (YUNG's Better Nether Fortresses) squidless -enders-delight|末影乐事 (Ender's Delight) -decostorage +enders-delight@|末影乐事 (Ender's Delight) +decostorage@decorative-storage mahogany aspen unmending-potato-edition|经验不修补：土豆版* @@ -9542,7 +9542,7 @@ opotato|哦，土豆！* contingameime@|游戏内输入法续更版 / 游戏内输入法 Forge 重置版 (ContingameIME / IngameIME-Forge / IngameIME-Forged) ccastroadds aerial-hell@ -swashbucklers +swashbucklers@ style eatable-livestock hunger-strike|绝食* @@ -9575,7 +9575,7 @@ geore-nouveau crimsonsteves-more-mobs the-ulterlands mt-lotr -asjcore +asjcore@ bane-tooltips-mod|克星信息显示* lava-crystal literal-sky-block @@ -9797,12 +9797,12 @@ compressor@ hexal@|咒法拓展* -create-encased@ +create-encased@|机械动力：封装工艺* @treeplacer death-knell@ moreiotas@ numismatic-overhaul@¨numismatic-overhaul-reforged -@hexbound|咒法组构学 (Hexbound) +hexbound-fork@|咒法组构学 (Hexbound)¨@hexbound|咒法组构学 (Hexbound) - 原-已失效 vanity-druid-pack vanity-farcrs-colossal-weapons debris-chunk-raw-netherite-scrap@raw-netherite-scrap|残骸碎块 (Debris Chunk) @@ -9841,7 +9841,7 @@ variant-crafting-tables endless-biomes@ chatimg|图片聊天 (chatImg) -throwable-explosives +throwable-explosives@ @skillmmo archeon@ chattoggle@ @@ -9850,7 +9850,7 @@ enchancement@ useful-spyglass@ -befriendmobs-days-with-monster-girls|友好化生物：与怪物娘的日常 (BefriendMobs: Days with Monster Girls) +nff-girls launchgui villager-armor-layer@|村民盔甲显示* wasabi@ @@ -9971,7 +9971,7 @@ floating-block@floating-cube|浮空立方体 (Floating Cube) curious-lanterns river-redux@ restrictions -create-modern-train-parts +create-modern-train-parts@modern-train-parts targetato messagetweaker @@ -9987,7 +9987,7 @@ fog-looks-good-now@ guarding@ cats-expanded@ modular-bosses -experience-obelisk +experience-obelisk@ here-be-no-dragons gnumus-settlement fading-night-vision @@ -10096,7 +10096,7 @@ name-tag-tweaks@|命名牌调整* funky-yoyo@funkyyoyo pierce-arrow tool-sharpening - +@ktfruaddon|群峦救援-非官方版扩展 (kTFRUAddon) pigsteel@pigsteel-fabric¨pigsteel-forge@ @@ -10117,7 +10117,7 @@ moa-decor-bath stealing-the-villagers-forge@¨stealing-the-villagers-fabric@ spoorn-armorattributes@spoorn-armor-attributes connectedness@ -epic-samurais@|史诗武士 (Epic Samurai's)¨epic-samurais-fabric@epic-samruais-fabric|史诗武士 (Epic Samurai's) +epic-samurais@|史诗武士 (Epic Samurai's / Samurai Dynasty)¨epic-samurais-fabric@epic-samruais-fabric|史诗武士 (Epic Samurai's / Samurai Dynasty) sandwiches-n-more enchantments-plus-fabric@enchantments-plus purpeille@ @@ -10292,7 +10292,7 @@ tool-upgrades@|工具升级* visiblebarriers@ aether-gravitation@|天境之引* @sublanguage|首选语言 (Sublanguage) -befriendmobs-api|友好化生物框架 (BefriendMobs Framework) +nff-services better-potion-visuals@ modern-warfare-cubed@|现代战争方块化* extraordinary-extra-totems @@ -10351,7 +10351,7 @@ barrels-2012 tfc-sample-drill tfc-rosia aether-additions -custom-portal-api-forge@customportalapi +custom-portal-api-forge@customportalapi|自定义传送门 API Forge 版 (Custom Portal API [Forge]) jaopca-extras enclosure@ @@ -10499,7 +10499,7 @@ arboria mekanism-evolution chiseledadditions -@tinkers_ingenuity|工匠匠心 (Tinkers Ingenuity) + gregtech-4|格雷科技4移植版 (GregTech 4 Rewritten) lacrimis productive-villagers@ @@ -10782,7 +10782,7 @@ hellions-sniffer@hellions-sniffer+ hybrid-flowers|杂交花* -methane@ +methane|Methane - 已失效¨@methane mushroom-villagers @litematica-server-paster s33r-butterfly-paintings @@ -10808,7 +10808,7 @@ haste-enchantment workshop-for-handsome-adventurer desert-upgrade ocean-recovery -more-armor-trims +more-armor-trims|更多盔甲纹饰* mc-mods-the-trims@allthetrims @bamboo-sign-editor|告示牌编辑器 (Bamboo Sign Editor) revival-orb@ @@ -11198,7 +11198,7 @@ armor-status-hud-renewed|耐久信息显示：重生 (Armor Status HUD Renewed) boblib placeable-mobs@placeble-mobs potion-blender@ -t6-auto-attack-mod@t6-auto-attack +t6-auto-attack-mod¨@t6-auto-attack|T6's Auto Attack Mod - 已失效 forceasciifont-backport vmtranslationupdate@vmupdate|VM汉化更新 (VM Translation Update) trample-no-more@ @@ -11284,7 +11284,7 @@ simple-achievements achievement-books|成就书* villager-enchanter|村民附魔师 (VillagerEnchanter) invocore-utility-mod -saljus-quill +saljus-quill@ derelict @charged-charms @@ -11304,7 +11304,7 @@ elfs-dark-dimension xaeros-minimap-world-map-waystones-compability jagms-kiwis@ @masaadditions -@improved-trident-enchantments +improved-trident@ mystic-bows forgiving-world @skillcloaks @@ -11445,7 +11445,7 @@ dual-swords@ organizable-play-screens@ labelling-containers@ inventory-pause-forge@ -ready-player-fun +ready-player-fun@ condensed-creative@ leaves-us-in-peace@ yellow-snow@ @@ -11509,7 +11509,7 @@ fine-tuned-calibration@finetunedcalibration third-person-maps@ carpet-minitweaks@minitweaks -time-in-a-bottle-forge +time-in-a-bottle-forge@time-in-a-bottle-universal seared-ladder-backport@seared-ladder-(backport) wall-jumped@ red-core@ @@ -11547,7 +11547,7 @@ zombiegame|僵尸游戏 (Zombie Game) effect-overhaul casualness-delight@|随意乐事* -eidolon-rebrewed +eidolon-rebrewed@ fruity-random-teleport|紫颂果味随机传送* pipe-master-2000|管道专家 2000 (Pipe Master 2000 / Pipe Googles) command-macros@|命令宏* @@ -11597,7 +11597,7 @@ cozy-foods-milk-tea opolis-miners@ netherite-but-cheaper @fabric-hammers -items-displayed-fabric@items-displayed¨items-displayed-forge@ +items-displayed-fabric@items-displayed|物品陈列 (Items Displayed)¨items-displayed-forge@|物品陈列 (Items Displayed) wood-converter hammer-mod @@ -11612,7 +11612,7 @@ niftycarts@ wither-dimension-whitelist @hexlink -usefulfood-reborn@ +usefulfood-reborn@¨usefulfood-community ancient-warfare-2-tweaked@ cuffed@ rockn-roller@rocknroller @@ -11667,7 +11667,7 @@ ars-oscura@|黑暗魔艺* bobby-reforged shut-up-gl-error@ no-spider@ -terracart-reloaded +terracart-reloaded@ dme fruit-stack@|果栈丰萦* gregtech-drawers @@ -11685,7 +11685,7 @@ quickstack @bhs|黑洞储存 (Black Hole Storage) collectors-album@ head-name-fix@headfix -hostile-delight|宿敌乐事 (Unusual Delight*) +hostile-delight@unusualdelight|异趣乐事/宿敌乐事 (Unusual Delight*) vivecraft-compat@|ViveCraft兼容 (ViveCraft Compat) wildlife-expanded-skunk@ keepheadnames@ @@ -11736,7 +11736,7 @@ well-behaved-mobs ancient-realms - +@remove-terralith-intro-message gambling-style animated-recipe-book @@ -12017,7 +12017,7 @@ tin-ore@tinore dark-elves-of-underdark titan-biomes depth-striders@ -endercage@ +endercage@|末影笼* mutationcraft@ aftershock@ limitless-concert|永无止境: 音乐会* @@ -12136,7 +12136,7 @@ coreextensions@|核心拓展 (CoreExtensions) @fast-items toad-terror @modern-industrialization-sound-addon -achievements-optimizer +achievements-optimizer@ automessage@auto-message ftb-quests-optimizer@ gfarm@ @@ -12196,7 +12196,7 @@ marbleds-villager-hats@ connector-extras@ akkamaddis-simple-tungsten|Simple Tungsten - 新 -just-enough-beacons-reforged +just-enough-beacons-reforged@ akkamaddis-additions@akkamaddis-simple-tungsten¨simple-cobalt|Simple Cobalt - 新 akkamaddis-ashenwheat@ @@ -12321,7 +12321,7 @@ terraria-calamity-mod|泰拉瑞亚灾厄 (Terraria Calamity) darkrtp-rtp-random-teleport@darkrtp cute-bears additional-fruits@ -bigger-better-end-cities@ +bigger-better-end-cities@|更好的末地城* @some-peripherals reden@ sparse-structures@sparsestructures @@ -12366,7 +12366,7 @@ mobile-beacon-1-18-forge durabuilt cavemans balloon-box -campfire-resting +campfire-resting@ fizzle grimoire-api @@ -12377,7 +12377,7 @@ creative-experience more-than-50 underground-jungle@ forge-soul-like-armors-reworked -@meds-and-herbs +meds-and-herbs@ soul-like-monsters-epic-fight-addon souls-like-parry tcdcommons@ @@ -12621,7 +12621,7 @@ omniwand@|全能魔杖* -key-binding-patch|按键绑定补丁* +key-binding-patch@|按键绑定补丁* packet-fixer@ new-xenchant@ more-brewable-potions@ @@ -12689,7 +12689,7 @@ autofire-bow-enchant rideableravagers@ passive-searchbar|被动搜索栏 (Passive SearchBar) -flower-mimics +flower-mimics@ vegan-delight|纯素乐事* bloodmooncmsfix-bmcmsfix evoodooers @@ -12732,7 +12732,7 @@ modular-item-api@¨truly-modular-arsenal@¨truly-modular-archery@¨truly-modular @actionhunger trafficcraft@ banilla-hammers@ -everyx-hotpot|一起火锅 (EveryXHotpot) +everyx-hotpot|一起火锅 (EveryXHotpot) - 他人代传¨@every-x-hotpot|一起火锅 (EveryXHotpot) @hira-hira tierability@ soul-collector@ @@ -12817,7 +12817,7 @@ medieval-buildings@ @you-thief-remastered-edition more-slabs-stairs-and-walls@ - +caves-canyons dragon-mounts-legacy-continued@|龙骑士重制版延续* embeddiumplus@ aggro-indicator @@ -12933,7 +12933,7 @@ zombies-reworked-forge@zombies-reworked legendary-monsters@ catontoasts-mobs combatify@ -go-fish-updated|一起钓鱼吧！(updated) (Go Fish (updated)) +go-fish-updated|一起钓鱼吧！(更新版) (Go Fish (updated)) what-are-they-up-to@ @fumo @@ -13017,7 +13017,7 @@ hammers-and-smithing tetra-booster-pack@withering-boon-for-tetra everlasting-skins - +decorated-pot-minecart|饰纹陶罐矿车* legacy-console-sounds@ eye-spy@ sonicraft-demons@ @@ -13069,7 +13069,7 @@ geotagged-screenshots@ @legacy-optifabric oneironaut@ -celestial-core|星月核心 (celestial_core) +celestial-core|星月核心* colorablefox|可染色狐狸/色绘你狐革 (Colorable Fox) @@ -13175,7 +13175,7 @@ pottery-additional-pots@pottery better-dogs-x-doggy-talents-next @villagertimetable towntalk -cumulus +cumulus@ epherolib icterine@ notrample @@ -13241,7 +13241,7 @@ ars-expanded-combat@ec-ars-compat @fluiwid revamped-phantoms@revamped_phantoms defaultserverlist@ -green-delights|绿里乐事* +green-delights|翠绿乐事* @modmenu-ornithe lost-city digestive @@ -13305,7 +13305,7 @@ mxtune customui|自定义UI (CustomUI) deadly-monsters-patched glodium@ -aether-delight +aether-delight|天境乐事* dungeonz@ cazfps-axolotls @@ -13329,7 +13329,7 @@ visible-offhand@|可见副手* phosphorcrashfix sound-physics-remixin|籁* hextended-staves@ -aquaculture-delight +aquaculture-delight|水产乐事* vics-point-blank@ occultism-kubejs tetra-extras@ @@ -13383,13 +13383,13 @@ better-quest-pop-up@ kiln-fabric@kiln tetra-niche-materials the-accurate-backrooms -create-trains-on-trains +create-trains-on-trains@ @campfire-torches-plus @armor-rack flux-networks-fabric@flux-network-fabric @surface poof-sounds@ -@crash-pipe +crash-pipe@ gradeus-epic-fight-addon-soul-like-boss zombie-more gunscraft|枪械工艺 (Guns Craft) @@ -13425,7 +13425,7 @@ march-of-the-ents|恩特的进军* rndtp in-world-buoyancy @simply-starminer -macos-input-fixes@ +macos-input-fixes@|MacOS输入修复 (MacOS Input Fixes) @maxhealthfixfixfix @astronomical @@ -13571,11 +13571,11 @@ epic-knightsnmages-fabric@epic-knightsnmages hotai|绷带* zeta@ taxtowncitizen -killer-rabbit-transformation|转化杀手兔* +killer-rabbit-transformation@killer-bunny-tweaks|转化杀手兔 (Killer Bunny Tweaks) bronze-viking astikor-carts-redux@astikorcarts-redux -third-person-shooting@third-person-shooting-zero|第三人称射击* +third-person-shooting@third-person-shooting-zero|第三人称射击：零 (Third Person Shooting: Zero) sight|视域* @the-first-city threetag-palladium@|钯 (Palladium) @@ -13630,7 +13630,7 @@ more-variants-and-biomes badoptimizations@ genshinimpactmod -diagonal-walls +diagonal-walls@ gravestones-die-classy-updated osog-city-cars immersive-vehicles-iav-parts-pack @@ -13703,7 +13703,7 @@ better-babies morecreativetabs-forge-fabric@morecreativetabs @shove! -sunflower-delight +sunflower-delight@|向日葵乐事* mystias-izakaya@mystiasizakaya|夜雀乐事* carpet-everything @@ -13809,7 +13809,7 @@ dirty-lens@ styled-player-list@styledplayerlist create-love-war@ -chainmailed +chainmailed@ serious-player-animations@ abridged@ hexvr@ @@ -13826,7 +13826,7 @@ myworldgen medieval-buildings-end-edition orpheus@ -@create-sweets-and-treats +create-sweets-and-treats@ klsts-beyond-netherite refined-polymorphism@ @@ -13841,7 +13841,7 @@ butchery enchantment-reveal@ -copycats@ +copycats@|机械动力：伪装方块+ (Create: Copycats+) the-great-alchemical-compendium@ desperate-measures@ block-slabs-mod @@ -13985,7 +13985,7 @@ trajectory-estimation@|弹道估计* -iron-repair-kits +iron-repair-kits@ @susinsert critters-n-crawlers@ @@ -14021,7 +14021,7 @@ deeper-caves@deeper_caves -arborfirmacraft|林海传说 (ArborFirmaCraft) +arborfirmacraft@arborfirmacraft-(afc)|林海传说 (ArborFirmaCraft) enchanting-with-tfc tfc-vessel-tooltip@ nether-gold-ore @@ -14066,7 +14066,7 @@ prehistoric-nature-decorations tinyfoes pyradium anvilcraft@|铁砧工艺：重力科技 (AnvilCraft) -tiny-mob-farm-remastered@ +tiny-mob-farm-remastered@|迷你刷怪场：重制* create-aquatic-ambitions@ ffl-trinkets-compat kaleidios-guns @@ -14100,7 +14100,7 @@ buildify@ @big-globe dragon-finder respackopts@ -fortuitous-feasts +fortuitous-feasts@ monazite@|独居石* music-control|音乐控制* - 不再更新¨@music-control|音乐控制 (Music Control) stellarcore|星核 (StellarCore) @@ -14124,7 +14124,7 @@ temporal-api@ callable-horse-unofficial-fabric-port|召之马来 Fabric版 (CallableHorse Unofficial Fabric port) -shiny-horses-forge-enchantable-horse-armor +shiny-horses-forge-enchantable-horse-armor@shiny-horses-forge spartan-weaponry-simpleores|斯巴达的武器：简单矿石 (Spartan Weaponry: SimpleOres) dye-depot@ @@ -14385,7 +14385,7 @@ pillar-patched novalogin|新星登录 (Nova Login) tfc-desire-paths@ tfc-ore-washing -tfc-hot-or-not@ + tfc-canes lhmob-difficulty-increase|变强的怪物 (LH Mob Difficulty Increase) @zombies-are-real-reforged @@ -14406,7 +14406,7 @@ animationjs@ raids-backport crossbows-backport tfc-caelum@ -epic-compat-parcool +epic-compat-parcool@ loqui@ real-worlds @@ -14428,7 +14428,7 @@ tfc-fresh-water-everywhere@ tfc-more-swords galleria@ constructs-casting@ -@tinkersinnovation|工匠创新 (Tinkers' Innovation) +tinkers-innovation@tinkersinnovation|工匠创新 (Tinkers' Innovation) delicious-delights @vietnamsdelight @@ -14675,14 +14675,14 @@ customemoji|自定义表情 (CustomEmoji) sword-soaring|史诗战斗：御剑飞行 (Epic Fight - Sword Soaring) bigger-ae2@ scalar -trials-towers@|试炼高塔 (Trials Chambers) +trials-towers@trials-chambers-backport¨@trials-towers|Trials Chambers - 已失效 blus-sign-pack-mts-iv alexs-mediumcore@ sherdsapi@ @kontraption musketeer-illager - +daker-acg|Daker ACG工艺 (DakerACG) bananarangs@ remorphed@ particle-core@ @@ -14725,7 +14725,7 @@ achievement-detection-fix|成就检测修复* @chais-inventory-sorter -@mysteriumlibunofficial +@myceliumlib|菌丝 (Mycelium Lib) witcherypatch@|巫术补丁 (WitcheryPatch) @@ -14876,7 +14876,7 @@ life-is-precious|生命是宝贵的 (Life is precious) advanced-skills@|进阶技能* nuts-delight -@vegetables-delight +vegetables-delight@ enderpack@ ingame-mod-configs|游戏内模组配置 (InGame Mod Configs) playertag|玩家标签 (PlayerTag) @@ -14900,7 +14900,7 @@ slashblade-resharped@|拔刀剑：重锋 (SlashBlade: Resharped) spawn-mod@ @smooth-swapping-1.20.4-port @create-tab-fix -@srp-origins +scape-and-run-origins@srp-origins origins-extra-keybinds@origins-extra-keybinds-fabric epic-knights-addon @@ -14931,7 +14931,7 @@ totally-lit@ mo-shiz-mod aetheric-tetranomicon -arda-addon|阿尔达拓展*¨lotr-arda|阿尔达拓展 (Arda Addon) - Snow的阿尔达拓展 +arda-addon|阿尔达拓展* @potionwarning a-good-place@ aether-protect-your-moa@ @@ -15004,7 +15004,7 @@ what-is-stone-colorful-caves@what-is-stone-(colorful-caves) vtones heavy-inventories|物品负重* vs-addition@ -gravity-torch +gravity-torch@ lifesteal-forge-fabric@ mores-by-its-infinite dragonite-gear @@ -15042,7 +15042,7 @@ battlemusic@ @embyui engineered-golems axifier@ -renderjs +renderjs@ @enchantment-compat dehand@ jadecolonies @@ -15054,7 +15054,7 @@ create-metallurgy@|机械动力：冶金学 (Create: Metallurgy) the-shy-guy @tea-time @cobbreeding -@cobblemon-myths-and-legends-addon +@cobblemon-myths-and-legends-sidemod @rctmod create-klinks-n-klangs@klinksnklangs mo-than-enough-guns@ @@ -15117,7 +15117,7 @@ cubic-villager @morecursors|更多光标 (MoreCursors) true-infinity nukateams-gun-lib@ntgl -fantastic-biomes-cave@ +fantastic-biomes-cave nukacraft@thenukacraft enchantment-limiter emi-ores@ @@ -15132,7 +15132,7 @@ waystones-teleport-pets@ @sneaky-link create-mortar@ forgelin-continuous@ -@ripples-of-the-past-killer-queen-addon +@ripples-of-the-past-killer-queen-addon|RotP：杀手皇后附属 (Ripples of the Past: Killer Queen Addon) ninjin-knockback-dbc-by-hedaox wings-3 dstathud@ @@ -15198,7 +15198,7 @@ dralards-rock-candy-mod @explosion-breaks-no-block|爆炸不破坏方块 (Explosion Breaks No Block) via-romana@ -lithic-coins|石质硬币* +lithic-coins dynamic-trees-for-natures-spirit@|动态的树：自然之灵附属 (Dynamic Trees for Nature's Spirit) gore-edition christmas-wish-in-a-bottle @@ -15257,7 +15257,7 @@ iap-omega-craft iap-mekanism industrial-agriculture-plugin-silents-mechanisms -roads-and-roofs-tfc +roads-and-roofs-tfc@ taxvillagearchitect taxoceanarchitect nethers-flora @@ -15309,7 +15309,7 @@ lexiconfig@ @advancementsfullscreen luckys-wardrobe@ @forkkit -@more-affordable-than-ever +more-affordable-than-ever-never-too-expensive@more-affordable-than-ever what-am-i @camoverlay @@ -15474,18 +15474,18 @@ disable-front-perspective@ thaumcraft-6-aspects-for-jei@ @up-and-away -@ripples-of-the-past-hermit-purple-addon +@ripples-of-the-past-hermit-purple-addon|RotP：紫色隐者附属 (Ripples of the Past: Hermit Purple Addon) nc-steam-additions@nuclearcraft-steam-additions aura-cascade|气场流注* rac-compat@ spartan-weaponry-addon-toolkit@ - +smsn@ sneaky-tree-growing-forge@sneaky-tree-growing¨sneaky-tree-growing-fabric hungry-zombies @gravity-gourds usa-delight experience-farm -@ad_extendra-continuation +ad-extendra-dandi2k8-version@ad_extendra-continuation nebulus-juice-trader@ cthulhu-fishing@ large-super-potato|大型超级马铃薯* @@ -15516,7 +15516,7 @@ villager-in-a-bucket@ nebulus-trader-for-the-desert nebulus-jungle-trader@nebulus-trader-for-the-jungle mushroom-villager-trader@ -nebulus-better-portals@ +nebulus-better-portals¨@nebulus-better-portals|Nebulus Better Portals - 已失效 resource-ghouls avaritianeo|无尽贪婪Neo (AvaritiaNeo) create-legacy@ @@ -15529,7 +15529,7 @@ text-placeholder-api@placeholder-api|文本占位符 API (Text Placeholder API) @tt20 kasugalib@ - +@c2h6s-tinker|乙硫基匠魂 (C2H6S Tinker) kubejs-mekanism-unofficial @mediaplayer|媒体播放器 (MediaPlayer) @@ -15538,7 +15538,7 @@ nebulus-trader-for-the-plains mokels-more-spiders exposure-catalog@ -skinchanger +skinchanger@ @halflifemenu sitting@sitting+ @@ -15619,7 +15619,7 @@ yamazakura-reforked|山樱之刃重置版 (Yamazakura reforked) apothic-spawners -sinocore|华夏核心 (SinoCore) +sinocore@|华夏核心 (SinoCore) tinted-dyes@ dynamic-trees-ecologics@|动态的树：丰富的生态附属 (Dynamic Trees - Ecologics) craftablecapes@|可合成的披风 (Craftable Capes) @@ -15694,7 +15694,7 @@ pet-the-frog@frog-petting ex-nihilo-extras@ cycle-title-screen-splash@ hide-invisible-armor@ -inventory-tweaks-refoxed +inventory-tweaks-refoxed@ bigshot@ more-immersive-aircraft legendary-survival-overhaul|传说生存* @@ -15733,7 +15733,7 @@ sandfilter@|砂滤器 (Sand Filter) resaplingslayer@|雁雅得枝 (ReSaplingslayer) cerberu@|狱牙抵战 (Cerberus) remoreloyaltrident@|远亦得珍 (ReMoreloyaltrident) -potionlevelfix@|药引对注 (PotionLevelFix) +potionlevelfix@|药水等级修复/药引对注 (PotionLevelFix) reunmending@|以验垫砧 (ReUnmending) reghostjump@|引殃髑至 (ReGhostJump) rebroken-blade@|隐影刀珍 (Mowzie's Mobs: ReBroken Blade) @@ -15753,7 +15753,7 @@ remove-purpleprison-ads timeoutfixes forgeskyboxes@ customfishing|随液钓趣 (CustomFishing) - +metr0polis@metropolis crust@ sc-structurecraft@structurecraft @@ -15808,7 +15808,7 @@ ender-dragon-loot oh-the-trees-youll-grow@ oh-the-biomes-weve-gone@|我们走过的生物群系 (Oh The Biomes We've Gone) -@dblockbusterdisplays +dblockbusterdisplays@ @waygl @@ -15997,7 +15997,7 @@ the-masquerade-illager-boss@the-masquerade-(illager-boss) better-armory-x sweetys-horse-armor-tweaks@ fired-pots@ -under-the-moon +under-the-moon@|驻月夜下 (Under the Moon) coffeegs-colorful-world jeb_-wool@|jeb_羊毛 (jeb_ Wool) illage-and-spillage-finally-ported @@ -16034,7 +16034,7 @@ aaa-particles@ @anno compass3d@ @clockin -diggus-maximus-reborn +diggus-maximus-reborn@ satisfying-buttons@ item-on-chest-fabric@item-on-chest industrialreborn@ @@ -16068,7 +16068,7 @@ boss-keys mace-variants shortswords@new-short-swords bbs-mod@ -monocle +monocle@monocle-iris move-ui@ terrafly achievements-mod-200@mysticrift-achievements @@ -16153,7 +16153,7 @@ hold-easy-place@|保持简单放置* -spartan-and-fire-lightning-edition|斯巴达之冰与火-闪电版 (Spartan and Fire - Lightning Edition) +spartan-and-fire-lightning-edition|斯巴达之冰与火-雷电版 (Spartan and Fire - Lightning Edition) the-twilight-forest-deforestation-edition|暮色森林 - Deforestation 版 (The Twilight Forest - Deforestation Edition) minieffects-legacy-extended-life @@ -16200,7 +16200,7 @@ mcfetch@ reignited-hud@ more-crafter-variants@ sharingan-addon-ahznbs-naruto-mod -create-tacz-automation +create-tacz-automation@ tacz-plus-timeless-and-classics-feature-addon@tacz-plus fibers-guns-pack-for-tacz @splinecart @@ -16222,7 +16222,7 @@ stop-repeating-command-block-reborn@|停！循环型命令方块：重生* parry-us@parry!|予以刀振/格挡！ (Parry) frycooks-delight@|油炸乐事 (Frycook's Delight) -advancedae +advancedae@ pretty-pipes-fluids|更好的管道：流体 (Pretty Pipes: Fluids) webstone@ @@ -16291,7 +16291,7 @@ immersive-farming@|沉浸农业* @vpb-too-many-guns death-angels|死亡天使* the-pale-hound -monsters-girls +monsters-girls@ monsters-girls-secrets-of-mermaids dios-tiny-ore@ defence-craft @@ -16426,7 +16426,7 @@ linear-xp-forge|验依定值/线性经验 (Linear Xp Curve) dumplings-delight-reload@|饺子乐事：重启* - +auto-switch-elytra@autoswitchelytra|自动切换鞘翅* gregtech-placeable-emitters@ @@ -16527,7 +16527,7 @@ just-another-random-spawn|遥缘调址/随机出生点* realistic-mobs@ fullthrottle-alchemist fullthrottle-nei -creature-compendium +creature-compendium@ desert-update ancient-elements left-behind@ @@ -16535,17 +16535,17 @@ corrupted-witherskeleton-boss-mod mca-api -sodium-leaf-culling@sodiumleafculling +sodium-leaf-culling@sodiumleafculling|钠：树叶剔除* homing-xp-orb|引验导追/归航经验球* multiblocked2 armorstatushud-updated|耐久信息显示更新版 (ArmorStatusHUD Updated) tfc-better-blast-furnace tfc-textile@ tfc-woodworking@ -tfc-auroras +tfc-auroras@auroras greg-paintings@ gtmthings -create-trading-floor +create-trading-floor@ @fishy-create-stuffs|Yu的机械动力附属 (Fishy Create Stuffs) biolith@ hungrier@ @@ -16637,7 +16637,7 @@ the-ceilands@|垂顶之地* snowbound@snow_bound opencomputers-icbm-classic-addon¨icbm-opencomputers|Opencomputers ICBM-Classic Addon - 教程文档 @ad-astra-pandoras-frontier -cosmic-horizons@cosmic-horizons(cosmos) +cosmic-horizons@cosmic-horizons-cosmos shadow-x-netherite-scrap-from-piglin-brutes|猪灵蛮兵掉落下界合金碎片 (Netherite Scrap From Piglin Brutes) better-modlist-neoforge@better-modlist @@ -16667,7 +16667,7 @@ archeological@archeologicalmod clarity backpacked-world-of-color@ nofov -cobalt-custom-chunk-renderer@cobaltmod +cobalt-custom-chunk-renderer|钴 (Cobalt)¨@cobaltmod|钴 (Cobalt) - 已失效 spartacus-army-uniform soviet-army-uniform@ german-uniforms-ww2 @@ -16675,9 +16675,9 @@ german-uniforms-ww2 tameable@ - +slashblade-gamerelic|拔刀剑重锋附属·游戏扩增 (srelic) theovergrowth -jadens-nether-expansion +jadens-nether-expansion@ configurable@ @@ -16690,14 +16690,14 @@ configurable@ patpat @modernlifepatch|摩登生活补丁 (Modern Life Patch) @ivr -rusticdelight-refabricated@|乡村乐事：重织 +rusticdelight-refabricated@|乡村乐事：重织 (RusticDelight: Refabricated) scape-and-run-meshi@ @bad-apple-world-preset gastronomy-works@ @create-air-fabric colorfulwater -yungs-cave-biomes@¨yungs-cave-biomes-fabric +yungs-cave-biomes@|YUNG的洞穴生物群系 (YUNG's Cave Biomes)¨yungs-cave-biomes-fabric|YUNG的洞穴生物群系 (YUNG's Cave Biomes) @@ -16716,10 +16716,10 @@ tnt-plus-mod|TNT Plus - 所有¨@tnt-plus-mod|TNT Plus - 部分失效 @kelvins-better-player-animations-(port) tokusatsurecord|特摄唱片 (Tokusatsu Record) -origins-backgrounds-forge +origins-backgrounds-forge¨origins-backgrounds cataclysm-apotheosis-addon cave-dweller-reimagined¨cave-dweller-reimagined-fabric -out-of-combat +out-of-combat|脱战 (Out of Combat) soulfragment|灵魂碎片 (Soul Fragment) create-peaceful@ @@ -16732,7 +16732,7 @@ its-magispelling-time @dontsneakprogress|偷跑禁止 (DontSneakProgress) @unkindled -recipe-generator +recipe-generator@ @carbonfltr argonmod@|氩 (Argon) foggy-pale-garden@ @@ -16773,7 +16773,7 @@ scape-and-run-revenants warden-s-domain more-wardens hidden-realm@ -spells-gone-wrong +spells-gone-wrong@ wandrous@ cnpc-dbc-addon@customnpc-plus-dbc-addon salmons-genesis @@ -16782,29 +16782,579 @@ the-afterdark loaded-mods-checker@loadedmodschecker|存档模组核对* - +i-have-slept@|朕已安寝 (I have slept) @itemstackpromax|物品堆叠ProMax (ItemStackProMax) item-split-bug-fix|物品分裂修复* spontaneous-replace-cobwebbed@|自然更替：蛛丝网迹 (Spontaneous-Replace: Cobwebbed) modernconverter frozify@ potato-library -@swisscaves -@title-screen-blobcat +swisscaves@ +title-screen-blobcat@ punching-creepers@ ancient-curses resettleable-traders-forge-fabric@resettleable-traders|流浪商人安家 (Resettleable Traders) ihearttfc@ itemphysic-1-7-10-unofficial@itemphysic-1.7.10-unofficial|物品物理掉落非官方版 (ItemPhysic Legacy Unofficial) jei-area-fixer -ars-elixirum-fabric - +ars-elixirum¨ars-elixirum-neoforge¨ars-elixirum-forge +gold-nugget-recycling sodium-options-api@ crazyae|疯狂的AE (CrazyAE) - +ae2-crafting-tree-legacy|AE2合成树-传统版 (AE2CT-Legacy) ae2-alchemistry-addon novaultlimit@ -game-discs@|游戏光碟* \ No newline at end of file +game-discs@|游戏光碟* + + +vanilla-plus-resourceful-tools +create-horse-power@ +ars-technica +plustic-reforged@ +spawners-plus@spawners_plus +dracolotl + +sacks-n-such@ + + +camellialib@|山茶花核心 (CamelliaLib) +cameliaarmory@|花朵武器库 (FlowerArmory) + +moonrise@moonrise-opt +corpsecomplex-unofficial@ +@starlish +languagereloadunofficial@ +mekanism-covers@ +enchanted-wilderness-elegant-countryside@enchanted-wilderness-elegant-countryside.|优雅乡下 (Elegant Countryside) +better-durability-reforged|更好的耐久度：重铸* +sos|我来助你！ (SOS) +cherry-on-1-12-2@cherry_on_1.12.2|1.12.2的樱花 (Cherry_on_1.12.2) +scape-and-spartan-parasites|寄体斯巴达 (Scape and Spartan: Parasites) +@ripples-of-the-past-extra-stands-addon +the-knocker@ +vll-r-mystery +scp-origin +sniffers-delicacies +fix-changed +valkyrien-pirates@|瓦尔基里海盗* +pathogen +chrysalis@ +alekis-ridiculously-simple-roofs@alekiroofs +@trails +rainboows@ +texturized-particles@ +rple@ +reign-of-nether-rts-in-minecraft@reign-of-nether-rts|下界之治 (Reign of Nether RTS) +the-secret-doors + + +tame-tools@|驯兽工具* +@bia +vounierns-turrets +seafarer-forge +zombies-plus-frenzied-horde@ +@tetrismc +ecliptic-seasons|节气* +xibaoxx@|喜报 ×× (XiBao ××) + + +murasama-daker|鬼妖村正 (Murasama) +particle-storm|粒子风暴* +@2d-minecraft +till-it-breaks-updated@ +debark@ +till-it-breaks@ +end-reborn-expansion@end-reborn +@origins-genshin + + +the-glitched-one +progression-reborn@ + +@simple-info-display +@automaticmemories +zoom-camera@ +dpi-fix +@item-information-display|物品信息显示 (Item Information Display) +almanac-lib@almanac + +remove-blindness|移除失明 (Remove Blindess) - 不全¨@remove-blindess|移除失明 (Remove Blindess) +simplerpgcore@ +droppable-villager-trades@ +stackupper@ +colorful-orbs@ +@idmxd +modernxl-2-in-survival +creepercollateral +findmyitemsandfluids +@numeric-experience-info +aquapatch +aviator-dreams +macaws-stairs@ +cross-stitch-colours@ +gaming-deco@ +@reactive-music|韵律回响 (Reactive Music) +easel-does-it@ +rbasamoyais-betsy-ross@betsy-ross + + + + + +dropped-item-tweaks@droppeditemtweaks|掉落物调整* +movingquickly|禁用快速移动检查 (MovingQuickly) +@soup-api +@tsa-decorations +@autofarm-mod +gelato-galore-2@ +dyeable-jack-olanterns@ +white-pumpkins@ +dawn-of-the-flood@ +deatbutthreereload@|逝不过三：重开 (Death But Three Reload) +common-weapons +ore-silverfish-mod@ +gtbcs-spellbooks +project-lambda + + + + + +@pretty-hitboxes-create-addition|可配置的碰撞箱显示-机械动力功能附加 (Pretty Hitbox-Create Addition) +watersource-reborn@|水源：重生 (WaterSource: Reborn) +locks-unofficial@|锁：非官方版 (Locks-Unofficial) + +just-in-nether@ +jinghui|镜回 (jinghui) +@ripples-of-the-past-mandom-addon|RotP：男人领域附属 (Ripples of the Past: Mandom Addon) +@auto-gg +better-brightness-slider-respawn@ + + +animatica-foxified@ +mcchatgpt@ +@aimobs +ambiances@ambiance|氛围！ (Ambiance!) +screw-your-items@ +mace-port +bloodlines +vampiric-ageing-a-vampirism-addon +extra-enchantments-and-curses@ +enchanting-tweaker@enchanting-tweaks +just-a-lot-more-enchantments@ +alessandrvs-enchantments@alessandrv-enchantments +armor-abilities@ +sleepy-hollows@ + +nametag-tweaks@nametagtweaks|名称标签调整 (Nametag (Display) Tweaks) +@sodium-no-alerts +headshot-respawn@|爆头：重生 (Head Shot Respawn) +leafdecaystopper|树叶腐烂抑制器 (Leaf Decay Stopper) +animated-loading-screen@ +@rotp_whitesnake|RotP：白蛇附属 (Whitesnake Addon (Ripples of the Past)) +@ripples-of-the-past-made-in-heaven-addon|RotP：天堂制造附属 (Ripples of the Past: Made in Heaven Addon) +@ripples-of-the-past-c-moon-addon|RotP：新月附属 (Ripples of the Past: C-Moon Addon) +imbued-gear@ +tacz-js@ +ipla@ +bcg-util +sciophobia@|全局自定义文本阴影渲染* +lithic-addon-mod +light-blocks-from-1-17@ +light-and-shadow@ +@excavein +spanish-delight-a-farmers-delight-add-on@spanish-delight|西班牙乐事 (Spanish Delight) +ars-nouveaus-flavors-delight@arsdelight|新生乐事 (Ars Nouveau's Flavors & Delight / Ars Delight) +oceanic-delight|海之乐事* +the-player +kelka-craftable-animals@craftableanimals +super-hyper +wans-ancient-beasts@wab +invocations-spell-engine@invocations +gearifiers@ +recall-potion-neoforge@|回忆药水 (Recall Potion) +flowing-fluids@ +frights-and-foliage@ +blorfstone +filinkus-s-huge-tools +necromancer-mod +e_kedis-electronics +uprade-yourself + +smelting-touch-enchantment +shinobiorigins-utils +unifine +trailier-tales@ +mixinjs-coremod +mcwen +rank-system|评分系统* + +bundle-inventory|Bundle Inventory - 问题反馈¨@bundle-inventory +scroll-tweaks@scrolltweaks|鼠标滚轮调整* +neko-server@ +ride-every-thing@|骑乘一切* +cit-resewn-neopatcher@ +legendary-creatures|传说生物* +@meowcraft-mod + + + + +frozenlib@ +clientblock@ +eventjs +backup-manager@ +the-root-of-fear@ +the-modifiger@ +@keypreset|键位预设 (KeyPreset) + +sanity-prequel|理智：前传 (Sanity: Prequel) +ayame-paperdoll@|Ayame 纸娃娃 (Ayame PaperDoll) +@registry-helper-lib +@carpet-permissions +passive-shield@ +trap-expansion +roost-2-flying-higher +@amber +@liteminer +@lvlz-better-nether +@lvlz-better-end +cc-shops@ +modular-machinery-reborn +flare@ +rs-crafting-monitor-in-grid@ +@photonics +lambdynamiclights-unofficial-neoforge@ + +@heracles-button +voicecontrol|声控* +hex-ars-linker@|魔力媒质链接 (Hex-Ars Linker) +bingolobby@|宾果游戏大厅 (BingoLobby) +worldedit-legacy@worldedit-legacy-enhanced +@nohealthbar +asm-fixes-j-a-f-m +moestweaks +prickle@ +farming-3x3@ +trickery@ +kebab +farmers-croptopia@ +mc-mods-trees-drop-apples +@infinite-dimensions + +mofus-broken-constellations +starlance@ +beneath@ +@simpleclientbase|简易客户端：基础 (SimpleClientBase) + + +ultimate-enchantment@|终极附魔* +ron-settings +backpack-display@|背包物品内容显示* +horrrs-pvz|Horrrs的植物大战僵尸* +@optibabric +item-restrictions@ +vintage-animations@ +the-one-who-watches@ +scp-ultimate +herobrines-omen +sws-wukong +dragns-valiant-vehicles@dragns-valiant-vehicles! +bio-factory@biofactory|机械动力：血肉工厂 (Create: Bio-Factory) +create-ad-astra-compatibility +create-mechanical-chicken@1.20.1-1.1.1.h-48 +zbgt@ +casinocraft +@mql-tir5d-turtle +toadlib@ + + +crosshair-tweaks@crosshairtweaks|十字准星调整* +what-did-i-just-kill@ +scalablelux@ +weather-changer@ +iron-nugget-recycling +@picohud + +gtmoreoreprocessing@ +computercraftedu +bibliocraft-legacy +simple-clouds@ + + +furniture-modcraft@several-furniture-craft + +spellblades-and-such-hexblade + +sons-of-sins-organs-additions|七罪之子：器官添加 (Sons Of Sins: Organs Additions) +sons-of-sins-organs-museum|七罪之子：器官博物馆 (Sons of Sins: Organ Museum) +mobs-of-sins-alexs-mobs-integration-forge|七罪之子: Alex的生物集成 (Mobs of Sins: Alex's Mobs Integration [Forge]) +stitched-sins|缝合的罪* +@bio-delight|血肉乐事 (Biomantic Delight) + +the-sculpture +goop@ +neepmeat@ + + + +@huangsheng1s-more-monster|更多怪物 (HuangSheng1's More Monster) +creeping-woods +@zombie-apocalypse-core +dragon-mounts-2@|龙骑士2：延续 (DragonMounts2: Continued) +life-fruits@|生命果* +ati-structures +fantasy-armor@fantasy_armor +beautiful-enchanted-books@beautiful-enchanted-books-mod-edition + + +void-fog@voidfog +@legacy-rocket-model|旧版火箭模型 (Legacy Rocket Model) + + + +tinker-i-o-ce|工匠接口社区版 (Tinker I/O CE) +more-shield-variants@ + +bendy-items +paladins-oath + +roundabout-the-jojo-mod@roundabout_the_jojo_mod + + +enviromine-continuation@ +@toffys-hooks +mutants-buff + + +terrablenderfix@ +craterlib@ +@caramel-chat +spark-unforged@ +pack-mode-reborn +mc-mods-the-wood-weve-got@all-the-wood-weve-got +bibliowoods-legacy +hydrological@ +unilib@ + +modchu_playerformlittlemaidfml +quiet|迁噪碍音/玩家禁言* + +@bettertab +modular-machinery-reborn-mekanism@ + +dawn-of-time-roa-edition +buildpaste¨buildpaste-for-fabric +mutils@ +better-campfires@|更好的营火* +@mtr-renfe-addon +@gt-community-additions +more-create-burners|机械动力：燃烧室附加* +create-logistics@ +create-pneumatic-equipment@ +collisiondamage|碰撞伤害 (CollisionDamage) +@absolutely-proprietary +tensura-reincarnated@ +transformer|奥特化身：无限 (Becomes Ultraman:Infinity) +henshin|变身* +ridiculous-world + +quartz_craft@|石英工艺 (Quartz_Craft) +cursed-stare@ +legendblade|传世之刃 (legendblade) +@hypothermic-reforged +scape-and-run-parasites-extra@ +lauchs-shutters@shutters +golden-foods@golden-foods! +@alexscaves-delight +@spmreborn|烤地瓜：重生 (Sweet Potato Reborn) +dragon-fight-config-endergetic-addon + + + +celestial-forge|星月再锻* +mahjongcraft@|麻将工艺 (MahjongCraft) +formidulus@ +ames-stranger-things +herobrine-origins +milkable-blazes@ + +furniture-beetle@ +mekanism-x-create-northstar@ +@createz +create-smart-crafter@ +create-fuel-and-water-information@create-fuel-water-information +thematic@ +projects@more-composter-variants +more-fletching-tables@ +more-grindstone-variants@ +more-bed-variants@ +more-loom-variants@ +more-feeding-trough-variants@ +more-smoker-variants@ +manascore@ +ames-mobs-configuration|AME生物配置 +display-delight@ +realistic-torches-roa-edition + + +@slime +@x-backup +iron-barrels-forge@iron-barrels +spectral-decorations@ + + +trims-on-tools@ +galacticraft-automatic-resources|星系自动资源* + +@lx-light-assist-tool|轻辅助工具 (light assist tool) + + +roberts-building-pack|Robert的建筑扩展包 (Robert's Building Pack) +arcanus-continuum@ +ultimate-chess@ +sparkweave@ +visualjs +lights-out +a-night-stalker +the-faceless-duo +scape-and-run-parasites-meteorite@ +cravencrafts-bloody-bits@ + + + +fastlang +min-3-hall-a@ +modular-machinery-reborn-energistics@ +tweaks-for-galactic-science +java-version-checker +chatcopyrite + +terracart +noteblock-backport@ +scape-and-run-parasite-dimension@srdimension +hexdebug@|咒术调试 (HexDebug) +paths-of-sin@ +@mapperplugin +@enchantment-decomposition|附魔分解 (Enchantment Dismantling) +hide-key-binding@|隐藏按键绑定* + +inline@ +fluffy-fur@ + + +head-cutter|玩家剪头* +salty-s-realistic-forging@saltys-realistic-forging +@vs-wakes-compat +@vs-crumbles +@vs-ship-in-a-bottle +rustic-pancakes@ +ice-and-fire-delight@|冰火传说乐事 (Ice and Fire Delight) +additional-dragons +enigmatic-unity +ephemera@ +theurgy-kubejs@ +immersive-lanterns@ +txnilib@ +default-key-setup@|默认按键配置* +the-man-king +create-arms-race@ +powered-flashlight@ +vmc-mc@virtual-motion-capture-for-minecraft +@hexcellular +hex-conjuring@|咒术构筑* +hexjs@ +craftsense@ + +zenkorium-creatures +zhengelss-techguns-addon +more-artifacts + +tfcgenviewer@ +terra-math@ +lukis-crazy-chambers +tumbleweed-wasteland +irons-jewelry +atlas-api +loading-screen-messages + +nemos-invertory-sorting@nemos-inventory-sorting +@better-ux +@hudmini +ribs-panning +hotkettles@ +gift-drop@ +dragns-livestock-overhaul@ +storage-drawers-unofficial|储物抽屉非官方版* + +centrifuge-tiers-reproduced@ +dense-mekanism@ +simple-missles@ +galosphere-spellbooks +discerning-the-eldritch +@hexcassettes +wardens-plus +ender-wyrmlings + + +new-classic-battle-towers +chitin-equipment@ +mowzies-cataclysm +stardew-fishing-fabric@ +piglin-slayer@ +cataclysm-tools@ +witherite-gear +faunus@ +oo-ee-a-e-a@ + + + +sodium-embeddium-options-mod-compat@sodium-options-mod-compat +secureseed-reborn +creative-eats +mazerooms + +@chitinous_ties +brewable-dragons-breath@|龙息可酿造 (Brewable Dragon's Breath) +flerovium + + +gathering-torches-become-sunlight|薪火，造炬成阳* + + +no-arrows-in-you-respawn¨@no-arrows-in-yourespawn|No Arrows In You: Respawn - 审核中 + +glowcase@ +hitbox-api@ +@polynametag +broken-nametags@ +@compostable-flesh +a-cute-little-crock-pot@ +@bountifulharvest +wasteland-grocers +arcane-tablet +@unflavoured-pipes +curvy-pipes + + +classic-bar-legacy|经典状态条 延续版* +glowing-eyeblossom@ +openlink@|开放式联机 (OpenLink) +@vs-grapples +@mydriasis +no-mob-spawning-on-plants +matmos2 +durability-rework@ +more-villagers-re-employed@ +similsax-transtructors +tcw-bedrock-breaker +apothic-reforge-tokens +advanced-skills-remastered@|进阶技能：重制版 (Advanced Skills: Remastered) +monsters-and-dungeons +cultivate-the-eternal-realm@IwYRM3LA +too-much-bosses +valoria@ +glowroot@ \ No newline at end of file diff --git a/Plain Craft Launcher 2/Resources/java-wrapper.jar b/Plain Craft Launcher 2/Resources/java-wrapper.jar index 29d7632..bd14bd6 100644 Binary files a/Plain Craft Launcher 2/Resources/java-wrapper.jar and b/Plain Craft Launcher 2/Resources/java-wrapper.jar differ