From 6b27808b38d7ed11a7d9c36001c9e12e87e94d79 Mon Sep 17 00:00:00 2001 From: Zkitefly Date: Tue, 20 Aug 2024 05:49:57 +0000 Subject: [PATCH 1/9] Fix --- .../Pages/PageDownload/PageDownloadClient.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb index ea16f205e..f3f551784 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb @@ -34,7 +34,7 @@ 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" Type = "愚人节版" Version("id") = Version("id").ToString().Replace("point", ".") Version("type") = "special" From f23980be3287238c30c615761e8e9ce86f5f4fb6 Mon Sep 17 00:00:00 2001 From: Zkitefly Date: Tue, 20 Aug 2024 05:54:03 +0000 Subject: [PATCH 2/9] Fix --- .../Pages/PageDownload/PageDownloadClient.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb index f3f551784..16b9804c9 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb @@ -34,7 +34,7 @@ End If '愚人节版本 Select Case Version("id").ToString.ToLower - Case "2point0_blue", "2point0_red", "2point0_purple" "2.0_blue", "2.0_red", "2.0_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" From 496f5b9973329eef420a6707f89878a714bf7f8d Mon Sep 17 00:00:00 2001 From: Zkitefly Date: Tue, 20 Aug 2024 06:11:12 +0000 Subject: [PATCH 3/9] Fix --- .../Pages/PageDownload/PageDownloadClient.xaml.vb | 1 + .../Pages/PageDownload/PageDownloadInstall.xaml.vb | 1 + 2 files changed, 2 insertions(+) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb index 16b9804c9..46dd8e60d 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb @@ -28,6 +28,7 @@ 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" diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index 2230ba63a..c0e8596c8 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -603,6 +603,7 @@ 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" From b3d311118b02e20164a626366c6eca76e0f2ae27 Mon Sep 17 00:00:00 2001 From: Zkitefly Date: Tue, 20 Aug 2024 06:29:00 +0000 Subject: [PATCH 4/9] Fix --- .../Pages/PageDownload/PageDownloadInstall.xaml.vb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index c0e8596c8..67077670a 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -610,6 +610,11 @@ 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("id") = Version("id").ToString().Replace("point", ".") + Version("type") = "special" + Version.Add("lore", GetMcFoolName(Version("id"))) Case "20w14infinite", "20w14∞" Type = "愚人节版" Version("id") = "20w14∞" From 18cba4b4647b284d9ad61f426a42cd3259df7224 Mon Sep 17 00:00:00 2001 From: Zkitefly Date: Tue, 20 Aug 2024 06:46:03 +0000 Subject: [PATCH 5/9] Fix --- Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb | 6 +++--- .../Pages/PageDownload/PageDownloadClient.xaml.vb | 1 - .../Pages/PageDownload/PageDownloadInstall.xaml.vb | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb index af8c1aca0..ccc0e3b4f 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb @@ -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 & "这个秘密计划了两年的更新将游戏推向了一个新高度！" diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb index 46dd8e60d..6e703b296 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb @@ -37,7 +37,6 @@ 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("id") = Version("id").ToString().Replace("point", ".") Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) Case "20w14infinite", "20w14∞" diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index 67077670a..883f33817 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -612,7 +612,6 @@ 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("id") = Version("id").ToString().Replace("point", ".") Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) Case "20w14infinite", "20w14∞" From cc598b8daf8199e34b89026e256bcd09907a76d7 Mon Sep 17 00:00:00 2001 From: Zkitefly Date: Tue, 20 Aug 2024 07:34:17 +0000 Subject: [PATCH 6/9] =?UTF-8?q?=E6=89=93=E5=BC=80=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/PageDownload/ModDownloadLib.vb | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb index e03a814ff..12093da75 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb @@ -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 @@ -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 From ab9737f0393577ec3258415608c6b8565565db8f Mon Sep 17 00:00:00 2001 From: Zkitefly Date: Tue, 20 Aug 2024 08:12:53 +0000 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Minecraft/ModDownload.vb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb index c7bd6d832..259d7c5ff 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb @@ -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")) @@ -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")) @@ -997,7 +997,8 @@ Versions.Add(New DlLiteLoaderListEntry With { .Inherit = Pair.Key, .IsLegacy = Pair.Key.Split(".")(1) < 8, - .IsPreview = RealEntry("stream").ToString.ToLower = "snapshot", + .IsPreview = RealEntry("stream").ToString.ToLower = Versions.Merge(UnlistedJson("versions")) +, .FileName = "liteloader-installer-" & Pair.Key & If(Pair.Key = "1.8" OrElse Pair.Key = "1.9", ".0", "") & "-00-SNAPSHOT.jar", .MD5 = RealEntry("md5"), .ReleaseTime = GetLocalTime(GetDate(RealEntry("timestamp"))).ToString("yyyy'/'MM'/'dd HH':'mm"), From 71fcdd75906340618ff1a57c668189333d438c69 Mon Sep 17 00:00:00 2001 From: Zkitefly Date: Tue, 20 Aug 2024 08:13:09 +0000 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=BF=9C=E5=8F=A4?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20=E6=A0=87=E8=AE=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb index ccc0e3b4f..f89b3868d 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb @@ -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 From e722d3ada2faa84bfa27e98ec08053bce3212b40 Mon Sep 17 00:00:00 2001 From: Zkitefly Date: Tue, 20 Aug 2024 08:16:36 +0000 Subject: [PATCH 9/9] Fix --- Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb index 259d7c5ff..31649812e 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb @@ -997,8 +997,7 @@ Versions.Add(New DlLiteLoaderListEntry With { .Inherit = Pair.Key, .IsLegacy = Pair.Key.Split(".")(1) < 8, - .IsPreview = RealEntry("stream").ToString.ToLower = Versions.Merge(UnlistedJson("versions")) -, + .IsPreview = RealEntry("stream").ToString.ToLower = "snapshot", .FileName = "liteloader-installer-" & Pair.Key & If(Pair.Key = "1.8" OrElse Pair.Key = "1.9", ".0", "") & "-00-SNAPSHOT.jar", .MD5 = RealEntry("md5"), .ReleaseTime = GetLocalTime(GetDate(RealEntry("timestamp"))).ToString("yyyy'/'MM'/'dd HH':'mm"),