diff --git a/MeloongCore b/MeloongCore index c774ae4..98157d6 160000 --- a/MeloongCore +++ b/MeloongCore @@ -1 +1 @@ -Subproject commit c774ae4c85fd94e0eaa171db21e78a65870df19b +Subproject commit 98157d65c7627721c816c02e8be96ac4fe61d615 diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index 902abdb..d35da3a 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -11,8 +11,11 @@ Public Class FormMain Dim FeatureList As New List(Of KeyValuePair(Of Integer, String)) '统计更新日志条目 If BuildType = BuildTypes.Release Then + If LastVersion < 413 Then 'Release 2.99.0.0 + FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "删除:为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……")) + End If If LastVersion < 411 Then 'Release 2.14.0.0 - FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "新增:允许修改、添加、移除、更新已安装版本的 MC 版本以及各个组件,可从版本设置中进入")) + FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "新增:允许修改、添加、移除、更新已安装版本的各个组件,可从版本设置中进入")) FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化:启动游戏时允许按 Esc 取消")) FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化:允许复制主页的启动日志中的内容")) FeatureCount += 19 @@ -100,8 +103,11 @@ Public Class FormMain '3:BUG+ IMP* FEAT- '2:BUG* IMP- '1:BUG- + If LastVersion < 414 Then 'Snapshot 2.99.0.0 + FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "删除:为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……")) + End If If LastVersion < 412 Then 'Snapshot 2.14.0.0 - FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "新增:允许修改、添加、移除、更新已安装版本的 MC 版本以及各个组件,可从版本设置中进入")) + FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "新增:允许修改、添加、移除、更新已安装版本的各个组件,可从版本设置中进入")) FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化:启动游戏时允许按 Esc 取消")) FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化:允许复制主页的启动日志中的内容")) FeatureCount += 19 @@ -1070,6 +1076,10 @@ Public Class FormMain RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.TaskManager)) Return Catch ex As Exception + If RestrictMcDownload AndAlso ex.Message = "为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……" Then + Hint(ex.Message, HintType.Red) + Return + End If If ex.IsCanceled Then Return '安装失败,继续往后尝试 End Try diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb index 6a89d7f..422e405 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModBase.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModBase.vb @@ -6,12 +6,12 @@ Public Module ModBase #Region "声明" '下列版本信息由更新器自动修改 - Public Const VersionBaseName As String = "2.14.0.0" '显示用版本名 + Public Const VersionBaseName As String = "2.99.0.0" '显示用版本名 Public Const CommitHash As String = "" 'Commit Hash,由 GitHub Workflow 自动替换 #If RELEASE Then - Public Const VersionCode As Integer = 411 '正式版 + Public Const VersionCode As Integer = 413 '正式版 #Else - Public Const VersionCode As Integer = 412 '快照版 + Public Const VersionCode As Integer = 414 '快照版 #End If '版本信息 diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb index eb55c72..681fce1 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb @@ -8,6 +8,10 @@ Public Module ModModpack ''' 弹窗要求选择一个整合包文件并进行安装。 ''' Public Sub ModpackInstall() + If RestrictMcDownload Then + Hint("为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……", HintType.Red) + Return + End If Dim File As String = Dialogs.SelectFile("选择整合包压缩文件", False, filter:={({"rar", "zip", "mrpack"}, "整合包文件")}).FirstOrDefault() '选择整合包文件 If String.IsNullOrEmpty(File) Then Return RunInThread( @@ -81,6 +85,7 @@ Public Module ModModpack End If End Try '执行对应的安装方法 + If RestrictMcDownload Then Throw New Exception("为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……") Select Case PackType Case 0 Logger.Info("整合包种类:CurseForge") diff --git a/Plain Craft Launcher 2/Modules/ModSecret.vb b/Plain Craft Launcher 2/Modules/ModSecret.vb index 598102a..a8032f2 100644 --- a/Plain Craft Launcher 2/Modules/ModSecret.vb +++ b/Plain Craft Launcher 2/Modules/ModSecret.vb @@ -15,6 +15,7 @@ Friend Module ModSecret #Region "网络鉴权" + Public Const RestrictMcDownload As Boolean = True Friend Function SecretCdnSign(UrlWithMark As String) As String If Not UrlWithMark.EndsWithF("{CDN}") Then Return UrlWithMark Return UrlWithMark.Replace("{CDN}", "").Replace(" ", "%20") diff --git a/Plain Craft Launcher 2/My Project/AssemblyInfo.vb b/Plain Craft Launcher 2/My Project/AssemblyInfo.vb index fb6f794..0fc0a07 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/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index 2ce085e..a59aa66 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -14,7 +14,11 @@ Public Class PageDownloadInstall Public Overridable Sub LoaderInit() Handles Me.Initialized ControlInit() - PageLoaderInit(LoadMinecraft, PanLoad, PanAllBack, Nothing, DlClientListLoader, AddressOf LoadMinecraft_OnFinish) + If RestrictMcDownload Then + PageLoaderInit(LoadMinecraft, PanLoad, PanAllBack, Nothing, New LoaderTask(Of String, DlClientListResult)("关闭下载", Sub() Throw New Exception("为遵守相关法律法规,PCL 暂时不再提供 MC 下载功能,非常抱歉 qwq……")), AddressOf LoadMinecraft_OnFinish) + Else + PageLoaderInit(LoadMinecraft, PanLoad, PanAllBack, Nothing, DlClientListLoader, AddressOf LoadMinecraft_OnFinish) + End If End Sub Private IsLoad As Boolean = False diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadModify.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadModify.vb index ae44e04..f873fd9 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadModify.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadModify.vb @@ -312,7 +312,7 @@ Public Class PageDownloadModify TextSelectName.ValidateRules = New ObjectModel.Collection(Of Validate) From { New ValidateFolderName(McFolderSelected & "versions", IgnoreList:=New List(Of String) From {OriginalName})} '修改页 UI - CardMinecraft.Visibility = Visibility.Visible + CardMinecraft.Visibility = If(RestrictMcDownload, Visibility.Collapsed, Visibility.Visible) BtnBack.Visibility = Visibility.Collapsed ImgLogo.Margin = New Thickness(15, 15, 0, 0) TextSelectName.Margin = New Thickness(56, 16, 16, 0) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/Resource/PageDownloadCompDetail.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/Resource/PageDownloadCompDetail.xaml.vb index e8ec615..85ef19c 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/Resource/PageDownloadCompDetail.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/Resource/PageDownloadCompDetail.xaml.vb @@ -272,7 +272,7 @@ GroupDone: End If '实例化每个元素 For Each Version In Versions - If TargetResourceType = ResourceTypes.ModPack Then + If Not RestrictMcDownload AndAlso TargetResourceType = ResourceTypes.ModPack Then Stack.Children.Add(Version.ToListItem(AddressOf Install_Click, AddressOf Save_Click, IsBadDisplay:=HasDuplicates)) Else Stack.Children.Add(Version.ToListItem(AddressOf Save_Click, IsBadDisplay:=HasDuplicates)) diff --git a/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml b/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml index 4cdff7e..a19f018 100644 --- a/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml +++ b/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml @@ -131,23 +131,10 @@ - - - - - + + - - - - - - - - - - @@ -156,93 +143,20 @@ + - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -271,6 +185,7 @@ + @@ -280,10 +195,12 @@ + + @@ -306,80 +223,34 @@ - - - - + + + + + + - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -413,6 +284,7 @@ + @@ -425,97 +297,42 @@ - - - - + + + + + - - - - - - - - - - - - - + - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -550,6 +367,7 @@ + @@ -569,71 +387,41 @@ - - - + + + + + - - - - - - + - + - - - - - - - - - - - - + - - - - - - - - - - - - - - - - @@ -650,27 +438,25 @@ + + + - - - - - + - - + @@ -678,21 +464,10 @@ - - - - - - - - - - - @@ -702,10 +477,10 @@ + + - - @@ -713,51 +488,33 @@ - - - - - - - - - - - - + + + - + - - - - - - - - - - + + - - - + +