Skip to content

Uvmc test #1

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 9 commits into from
Aug 20, 2024
Merged

Uvmc test #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6b27808
Fix
zkitefly Aug 20, 2024
f23980b
Fix
zkitefly Aug 20, 2024
496f5b9
Fix
zkitefly Aug 20, 2024
b3d3111
Fix
zkitefly Aug 20, 2024
18cba4b
Fix
zkitefly Aug 20, 2024
cc598b8
打开 更新日志 调整
zkitefly Aug 20, 2024
ab9737f
修改变量名称
zkitefly Aug 20, 2024
71fcdd7
修改 远古版本 标记时间
zkitefly Aug 20, 2024
e722d3a
Fix
zkitefly Aug 20, 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
12 changes: 6 additions & 6 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 @@ -208,9 +208,9 @@
'从指定URL获取并添加未列出的版本
Dim UnlistedJson As JObject = NetGetCodeByRequestRetry("https://zkitefly.github.io/unlisted-versions-of-minecraft/version_manifest.json", IsJson:=True)
' 替换 "pending" 为 "snapshot"
For Each versionm As JObject In UnlistedJson("versions")
If versionm("type").ToString() = "pending" OrElse versionm("id").ToString().StartsWithF("2point0") AndAlso versionm("type").ToString() = "release" Then
versionm("type") = "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"))
Expand Down Expand Up @@ -246,9 +246,9 @@
'从指定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 versionm As JObject In UnlistedJson("versions")
If versionm("type").ToString() = "pending" OrElse versionm("id").ToString().StartsWithF("2point0") AndAlso versionm("type").ToString() = "release" Then
versionm("type") = "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"))
Expand Down
14 changes: 7 additions & 7 deletions Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,10 @@ Public Module ModMinecraft
Else
ReleaseTime = JsonObject("releaseTime").ToObject(Of Date)
End If
If ReleaseTime.Year > 2000 AndAlso ReleaseTime.Year < 2013 Then
_Version.McName = "Old"
GoTo VersionSearchFinish
End If
If ReleaseTime.Year > 2000 AndAlso (ReleaseTime.Year < 2011 OrElse (ReleaseTime.Year = 2011 AndAlso ReleaseTime.Month < 9) OrElse (ReleaseTime.Year = 2011 AndAlso ReleaseTime.Month = 9 AndAlso ReleaseTime.Day <= 20)) Then ' 2000 年到 2011 年 9 月 20 日之间
_Version.McName = "Old"
GoTo VersionSearchFinish
End If
Catch
ReleaseTime = New Date(1970, 1, 1, 15, 0, 0)
End Try
Expand Down Expand Up @@ -1031,11 +1031,11 @@ ExitDataLoad:
Name = Name.ToLower
If Name.StartsWith("2.0") OrElse Name.StartsWith("2point0") Then
Dim Teg = ""
If Name.StartsWith("red") Then
If Name.EndsWith("red") Then
Teg = "（红色版本）"
ElseIf Name.StartsWith("blue") Then
ElseIf Name.EndsWith("blue") Then
Teg = "（蓝色版本）"
ElseIf Name.StartsWith("purple") Then
ElseIf Name.EndsWith("purple") Then
Teg = "（紫色版本）"
End If
Return Teg & "这个秘密计划了两年的更新将游戏推向了一个新高度！"
Expand Down
14 changes: 6 additions & 8 deletions Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,6 @@ Public Module ModDownloadLib
WikiName = "Java版RC2"
ElseIf Id.StartsWithF("1.19_deep_dark_experimental_snapshot-") OrElse Id.StartsWithF("1_19_deep_dark_experimental_snapshot-") Then
WikiName = Id.Replace("1_19", "1.19").Replace("1.19_deep_dark_experimental_snapshot-", "Java版Deep_Dark_Experimental_Snapshot_")
ElseIf Id.StartsWithF("1_18_experimental-snapshot-") OrElse Id.StartsWithF("1.18_experimental-snapshot-") Then
WikiName = "Java版" & Id.Replace("1_18_", "1.18-").Replace("experimental-snapshot-", "-exp")
ElseIf Id.Contains("b1.9") Then
WikiName = "Java版" & Id.Replace("b", "Beta_").Replace("-pre", "_Prerelease_")
ElseIf Id = "c0.30_01c" OrElse Id = "c0.30_survival" OrElse Id.Contains("生存测试") OrElse Id = "c0.30-1" OrElse Id = "c0.30-2" Then
Expand All @@ -292,22 +290,22 @@ Public Module ModDownloadLib
ElseIf VersionJson("type") = "release" OrElse VersionJson("type") = "snapshot" OrElse VersionJson("type") = "special" Then
WikiName = If(Id.Contains("w"), "", "Java版") & Id.Replace(" Pre-Release ", "-pre")
ElseIf Id.StartsWithF("b") Then
WikiName = "Java版" & Id.TrimEnd("-1", "-2", "-3").Replace("b", "Beta_").Replace("tb3", "Test_Build_3")
WikiName = "Java版" & Id.Replace("b", "Beta_").Replace("tb3", "Test_Build_3")
ElseIf Id.StartsWithF("a") Then
WikiName = "Java版" & Id.TrimEnd("-1", "-2", "-3").Replace("a", "Alpha_v")
WikiName = "Java版" & Id.Replace("a", "Alpha_v")
ElseIf Id.StartsWithF("inf-") Then
WikiName = "Java版" & Id.TrimEnd("-1", "-2", "-3").Replace("inf-", "Infdev_")
WikiName = "Java版" & Id.Replace("inf-", "Infdev_")
ElseIf Id.StartsWithF("in-") Then
WikiName = "Java版" & Id.TrimEnd("-1", "-2", "-3", "-2103", "-2304").Replace("in-", "Indev_")
WikiName = "Java版" & Id.Replace("in-", "Indev_")
ElseIf Id.StartsWithF("c") Then
WikiName = "Java版" & Id.TrimEnd("-1", "-2", "-3").Replace("c", "Classic_").Replace("st", "SURVIVAL_TEST")
WikiName = "Java版" & Id.Replace("c", "Classic_").Replace("st", "SURVIVAL_TEST")
ElseIf Id.StartsWithF("rd-") Then
WikiName = "Java版Pre-classic_" & Id
Else
Log("[Error] 未知的版本格式：" & Id & "。", LogLevel.Feedback)
Exit Sub
End If
OpenWebsite("https://zh.minecraft.wiki/w/" & WikiName.Replace("_experimental-snapshot-", "-exp"))
OpenWebsite("https://zh.minecraft.wiki/w/Special:%E6%90%9C%E7%B4%A2?search=" & WikiName.Replace("_experimental-snapshot-", "-exp"))
End Sub

#End Region
Expand Down
4 changes: 2 additions & 2 deletions Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
Not Version("id").ToString.ToLower.Contains("combat") AndAlso
Not Version("id").ToString.ToLower.Contains("rc") AndAlso
Not Version("id").ToString.ToLower.Contains("experimental") AndAlso
Not Version("id").ToString.ToLower.Contains("1.2") AndAlso
Not Version("id").ToString.ToLower.Contains("pre") Then
Type = "正式版"
Version("type") = "release"
End If
'愚人节版本
Select Case Version("id").ToString.ToLower
Case "2point0_blue", "2point0_red", "2point0_purple"
Case "2point0_blue", "2point0_red", "2point0_purple", "2.0_blue", "2.0_red", "2.0_purple", "2.0"
Type = "愚人节版"
Version("id") = Version("id").ToString().Replace("point", ".")
Version("type") = "special"
Version.Add("lore", GetMcFoolName(Version("id")))
Case "20w14infinite", "20w14∞"
Expand Down
5 changes: 5 additions & 0 deletions Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,12 +603,17 @@
Not Version("id").ToString.ToLower.Contains("combat") AndAlso
Not Version("id").ToString.ToLower.Contains("rc") AndAlso
Not Version("id").ToString.ToLower.Contains("experimental") AndAlso
Not Version("id").ToString.ToLower.Contains("1.2") AndAlso
Not Version("id").ToString.ToLower.Contains("pre") Then
Type = "正式版"
Version("type") = "release"
End If
'愚人节版本
Select Case Version("id").ToString.ToLower
Case "2point0_blue", "2point0_red", "2point0_purple", "2.0_blue", "2.0_red", "2.0_purple", "2.0"
Type = "愚人节版"
Version("type") = "special"
Version.Add("lore", GetMcFoolName(Version("id")))
Case "20w14infinite", "20w14∞"
Type = "愚人节版"
Version("id") = "20w14∞"
Expand Down