Skip to content

Uvmc test #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zkitefly merged 6 commits into from
Aug 29, 2024
Merged

Uvmc test #2

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d915767
Update ModDownload.vb
zkitefly Aug 29, 2024
b7880a0
Update ModDownload.vb
zkitefly Aug 29, 2024
3a7dec9
Update ModDownload.vb
zkitefly Aug 29, 2024
f1f1aa2
Update ModDownload.vb
zkitefly Aug 29, 2024
ce5e6fe
Revert "Update ModDownload.vb"
zkitefly Aug 29, 2024
1f9e2ea
Revert "Update ModDownload.vb"
zkitefly Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,18 @@
Dim Versions As JArray = Json("versions")
If Versions.Count < 200 Then Throw New Exception("获取到的版本列表长度不足（" & Json.ToString & "）")
'从指定URL获取并添加未列出的版本
Dim UnlistedJson As JObject = NetGetCodeByRequestRetry("https://zkitefly.github.io/unlisted-versions-of-minecraft/version_manifest.json", IsJson:=True)
' 替换 "pending" 为 "snapshot"
For Each versionuvmc As JObject In UnlistedJson("versions")
If versionuvmc("type").ToString() = "pending" OrElse versionuvmc("id").ToString().StartsWithF("2point0") AndAlso versionuvmc("type").ToString() = "release" Then
versionuvmc("type") = "snapshot"
End If
Next
Versions.Merge(UnlistedJson("versions"))
Try
Dim UnlistedJson As JObject = NetGetCodeByRequestRetry("https://zkitefly.github.io/unlisted-versions-of-minecraft/version_manifest.json", IsJson:=True)
' 替换 "pending" 为 "snapshot"
For Each versionuvmc As JObject In UnlistedJson("versions")
If versionuvmc("type").ToString() = "pending" OrElse versionuvmc("id").ToString().StartsWithF("2point0") AndAlso versionuvmc("type").ToString() = "release" Then
versionuvmc("type") = "snapshot"
End If
Next
Versions.Merge(UnlistedJson("versions"))
Catch ex As Exception
Log("[Download] 未列出的版本官方源加载失败: " & ex.Message)
End Try
'返回
Loader.Output = New DlClientListResult With {.IsOfficial = True, .SourceName = "Mojang 官方源", .Value = Json}
'解析更新提示（Release）
Expand Down Expand Up @@ -244,14 +248,18 @@
Dim Versions As JArray = Json("versions")
If Versions.Count < 200 Then Throw New Exception("获取到的版本列表长度不足（" & Json.ToString & "）")
'从指定URL获取并添加未列出的版本
Dim UnlistedJson As JObject = NetGetCodeByRequestRetry("https://raw.gitcode.com/zkitefly/unlisted-versions-of-minecraft/raw/main/version_manifest.json", IsJson:=True)
' 替换 "pending" 为 "snapshot"
For Each versionuvmc As JObject In UnlistedJson("versions")
If versionuvmc("type").ToString() = "pending" OrElse versionuvmc("id").ToString().StartsWithF("2point0") AndAlso versionuvmc("type").ToString() = "release" Then
versionuvmc("type") = "snapshot"
End If
Next
Versions.Merge(UnlistedJson("versions"))
Try
Dim UnlistedJson As JObject = NetGetCodeByRequestRetry("https://raw.gitcode.com/zkitefly/unlisted-versions-of-minecraft/raw/main/version_manifest.json", IsJson:=True)
' 替换 "pending" 为 "snapshot"
For Each versionuvmc As JObject In UnlistedJson("versions")
If versionuvmc("type").ToString() = "pending" OrElse versionuvmc("id").ToString().StartsWithF("2point0") AndAlso versionuvmc("type").ToString() = "release" Then
versionuvmc("type") = "snapshot"
End If
Next
Versions.Merge(UnlistedJson("versions"))
Catch ex As Exception
Log("[Download] 未列出的版本镜像源加载失败: " & ex.Message)
End Try
'返回
Loader.Output = New DlClientListResult With {.IsOfficial = False, .SourceName = "BMCLAPI", .Value = Json}
Catch ex As Exception
Expand Down