Quilt 支持

Plain Craft Launcher 2/Controls/MyCard.vb

@@ -164,6 +164,8 @@
  Stack.Children.Add(FabricDownloadListItem(CType(Data, JObject), AddressOf FrmDownloadInstall.Fabric_Selected))
  Case 13
  Stack.Children.Add(NeoForgeDownloadListItem(Data, AddressOf NeoForgeSave_Click, True))
+ Case 14
+ Stack.Children.Add(QuiltDownloadListItem(CType(Data, JObject), AddressOf FrmDownloadInstall.Quilt_Selected))
  Case Else
  Log("未知的虚拟化种类：" & Type, LogLevel.Feedback)
  End Select

Plain Craft Launcher 2/FormMain.xaml.vb

@@ -873,7 +873,7 @@ Public Class FormMain
  End If
  '多文件拖拽
  If FilePathList.Count > 1 Then
- '必须要求全部为 jar 文件
+ '必须要求全部为 Jar 文件
  For Each File In FilePathList
  If Not {"jar", "litemod", "disabled", "old"}.Contains(File.After(".").ToLower) Then
  Hint("一次请只拖入一个文件！", HintType.Critical)
@@ -900,7 +900,7 @@ Public Class FormMain
  End If
  'Mod 安装
  If {"jar", "litemod", "disabled", "old"}.Any(Function(t) t = Extension) Then
- Log("[System] 文件为 jar/litemod 格式，尝试作为 Mod 安装")
+ Log("[System] 文件为 jar / litemod 格式，尝试作为 Mod 安装")
  '获取并检查目标版本
  Dim TargetVersion As McVersion = McVersionCurrent
  If PageCurrent = PageType.VersionSetup Then TargetVersion = PageVersionLeft.Version
@@ -1087,6 +1087,7 @@ Install:
  DownloadForge = 6
  DownloadNeoForge = 7
  DownloadFabric = 8
+ DownloadQuilt = 10
  DownloadLiteLoader = 9
  DownloadMod = 11
  DownloadPack = 12

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

@@ -1186,7 +1186,7 @@ Re:
  Try
  GetJson(Content)
  Catch ex As Exception
- Throw New Exception("不是有效的 json 文件", ex)
+ Throw New Exception("不是有效的 Json 文件", ex)
  End Try
  End If
  Return Nothing
@@ -1198,7 +1198,7 @@ Re:
  End Class
 
  ''' <summary>
- ''' 尝试根据后缀名判断文件种类并解压文件，支持 gz 与 zip，会尝试将 jar 以 zip 方式解压。
+ ''' 尝试根据后缀名判断文件种类并解压文件，支持 gz 与 zip，会尝试将 Jar 以 zip 方式解压。
  ''' 会尝试创建，但不会清空目标文件夹。
  ''' </summary>
  Public Sub ExtractFile(CompressFilePath As String, DestDirectory As String, Optional Encode As Encoding = Nothing)
@@ -1447,7 +1447,7 @@ RetryDir:
  Return JsonConvert.DeserializeObject(Data, New JsonSerializerSettings With {.DateTimeZoneHandling = DateTimeZoneHandling.Local})
  Catch ex As Exception
  Dim Length As Integer = If(Data, "").Length
- Throw New Exception("格式化 json 对象失败：" & If(Length > 10000, Data.Substring(0, 100) & $"...(全长 {Length} 个字符)..." & Right(Data, 100), Data))
+ Throw New Exception("格式化 Json 对象失败：" & If(Length > 10000, Data.Substring(0, 100) & $"...(全长 {Length} 个字符)..." & Right(Data, 100), Data))
  End Try
  End Function
 

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

@@ -185,7 +185,7 @@ RequestFinished:
  Public Function NetGetCodeByRequestOnce(Url As String, Optional Encode As Encoding = Nothing, Optional Timeout As Integer = 30000, Optional IsJson As Boolean = False, Optional Accept As String = "", Optional UseBrowserUserAgent As Boolean = False)
  If RunInUi() AndAlso Not Url.Contains("//127.") Then Throw New Exception("在 UI 线程执行了网络请求")
  Url = SecretCdnSign(Url)
- Log($"[Net] 获取网络结果：{Url}，超时 {Timeout}ms{If(IsJson, "，要求 json", "")}")
+ Log($"[Net] 获取网络结果：{Url}，超时 {Timeout}ms{If(IsJson, "，要求 Json", "")}")
  Dim Request As HttpWebRequest = WebRequest.Create(Url)
  Dim Result As New List(Of Byte)
  Try

Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb

@@ -17,7 +17,7 @@
  End Try
  '检查 Json 是否标准
  If Version.JsonObject("downloads") Is Nothing OrElse Version.JsonObject("downloads")("client") Is Nothing OrElse Version.JsonObject("downloads")("client")("url") Is Nothing Then
- Throw New Exception("底层版本 " & Version.Name & " 中无 jar 文件下载信息")
+ Throw New Exception("底层版本 " & Version.Name & " 中无 Jar 文件下载信息")
  End If
  '检查文件
  Dim Checker As New FileChecker(MinSize:=1024, ActualSize:=If(Version.JsonObject("downloads")("client")("size"), -1), Hash:=Version.JsonObject("downloads")("client")("sha1"))
@@ -266,10 +266,10 @@
  Return Version("url").ToString
  End If
  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
@@ -1083,6 +1083,84 @@
 
 #End Region
 
+#Region "DlQuiltList | Quilt 列表"
+
+ Public Structure DlQuiltListResult
+ ''' <summary>
+ ''' 数据来源名称，如“Official”，“BMCLAPI”。
+ ''' </summary>
+ Public SourceName As String
+ ''' <summary>
+ ''' 是否为官方的实时数据。
+ ''' </summary>
+ Public IsOfficial As Boolean
+ ''' <summary>
+ ''' 获取到的数据。
+ ''' </summary>
+ Public Value As JObject
+ End Structure
+
+ ''' <summary>
+ ''' Quilt 列表，主加载器。
+ ''' </summary>
+ Public DlQuiltListLoader As New LoaderTask(Of Integer, DlQuiltListResult)("DlQuiltList Main", AddressOf DlQuiltListMain)
+ Private Sub DlQuiltListMain(Loader As LoaderTask(Of Integer, DlQuiltListResult))
+ Select Case Setup.Get("ToolDownloadVersion")
+ Case 0
+ DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlQuiltListResult), Integer)) From {
+ New KeyValuePair(Of LoaderTask(Of Integer, DlQuiltListResult), Integer)(DlQuiltListOfficialLoader, 30),
+ New KeyValuePair(Of LoaderTask(Of Integer, DlQuiltListResult), Integer)(DlQuiltListOfficialLoader, 60)
+ }, Loader.IsForceRestarting)
+ Case 1
+ DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlQuiltListResult), Integer)) From {
+ New KeyValuePair(Of LoaderTask(Of Integer, DlQuiltListResult), Integer)(DlQuiltListOfficialLoader, 5),
+ New KeyValuePair(Of LoaderTask(Of Integer, DlQuiltListResult), Integer)(DlQuiltListOfficialLoader, 35)
+ }, Loader.IsForceRestarting)
+ Case Else
+ DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlQuiltListResult), Integer)) From {
+ New KeyValuePair(Of LoaderTask(Of Integer, DlQuiltListResult), Integer)(DlQuiltListOfficialLoader, 60),
+ New KeyValuePair(Of LoaderTask(Of Integer, DlQuiltListResult), Integer)(DlQuiltListOfficialLoader, 60)
+ }, Loader.IsForceRestarting)
+ End Select
+ End Sub
+
+ ''' <summary>
+ ''' Quilt 列表，官方源。
+ ''' </summary>
+ Public DlQuiltListOfficialLoader As New LoaderTask(Of Integer, DlQuiltListResult)("DlQuiltList Official", AddressOf DlQuiltListOfficialMain)
+ Private Sub DlQuiltListOfficialMain(Loader As LoaderTask(Of Integer, DlQuiltListResult))
+ Dim Result As JObject = NetGetCodeByRequestRetry("https://meta.quiltmc.org/v3/versions", IsJson:=True)
+ Try
+ Dim Output = New DlQuiltListResult With {.IsOfficial = True, .SourceName = "Quilt 官方源", .Value = Result}
+ If Output.Value("game") Is Nothing OrElse Output.Value("loader") Is Nothing OrElse Output.Value("installer") Is Nothing Then Throw New Exception("获取到的列表缺乏必要项")
+ Loader.Output = Output
+ Catch ex As Exception
+ Throw New Exception("Quilt 官方源版本列表解析失败（" & Result.ToString & "）", ex)
+ End Try
+ End Sub
+
+ '''' <summary>
+ '''' TODO: Quilt 列表，BMCLAPI。
+ '''' </summary>
+ 'Public DlQuiltListBmclapiLoader As New LoaderTask(Of Integer, DlQuiltListResult)("DlQuiltList Bmclapi", AddressOf DlQuiltListBmclapiMain)
+ 'Private Sub DlQuiltListBmclapiMain(Loader As LoaderTask(Of Integer, DlQuiltListResult))
+ ' Dim Result As JObject = NetGetCodeByRequestRetry("https://bmclapi2.bangbang93.com/Quilt-meta/v2/versions", IsJson:=True)
+ ' Try
+ ' Dim Output = New DlQuiltListResult With {.IsOfficial = False, .SourceName = "BMCLAPI", .Value = Result}
+ ' If Output.Value("game") Is Nothing OrElse Output.Value("loader") Is Nothing OrElse Output.Value("installer") Is Nothing Then Throw New Exception("获取到的列表缺乏必要项")
+ ' Loader.Output = Output
+ ' Catch ex As Exception
+ ' Throw New Exception("Quilt BMCLAPI 版本列表解析失败（" & Result.ToString & "）", ex)
+ ' End Try
+ 'End Sub
+
+ ''' <summary>
+ ''' QSL 列表，官方源。
+ ''' </summary>
+ Public DlQSLLoader As New LoaderTask(Of Integer, List(Of CompFile))("QSL List Loader",
+ Sub(Task As LoaderTask(Of Integer, List(Of CompFile))) Task.Output = CompFilesGet("qsl", False))
+#End Region
+
 #Region "DlMod | Mod 镜像源请求"
 
  ''' <summary>

Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb

@@ -1517,7 +1517,7 @@ LoginFinish:
 
  '添加 MainClass
  If Version.JsonObject("mainClass") Is Nothing Then
- Throw New Exception("版本 json 中没有 mainClass 项！")
+ Throw New Exception("版本 Json 中没有 mainClass 项！")
  Else
  DataList.Add(Version.JsonObject("mainClass"))
  End If
@@ -1608,7 +1608,7 @@ NextVersion:
 
  '添加 MainClass
  If Version.JsonObject("mainClass") Is Nothing Then
- Throw New Exception("版本 json 中没有 mainClass 项！")
+ Throw New Exception("版本 Json 中没有 mainClass 项！")
  Else
  Result += " " & Version.JsonObject("mainClass").ToString
  End If