From d8fe5997399cdad68bfab9bdfb6b54296701a29f Mon Sep 17 00:00:00 2001 From: Pigeon0v0 Date: Sun, 16 Jun 2024 07:00:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=80=E6=9C=89=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=83=BD=E6=98=BE=E7=A4=BA=E4=B8=BA=E6=B5=8B=E8=AF=95=E7=89=88?= =?UTF-8?q?=20/=20=E6=AD=A3=E5=BC=8F=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb | 8 +++++--- .../Pages/PageDownload/ModDownloadLib.vb | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb index ad69aa1..a81f8fa 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb @@ -880,19 +880,21 @@ Dim Name As String '存储 rawVersion，貌似变化更加频繁 Dim StdVersion As String '存储 version，相对规则 Dim IsBeta As Boolean - If Token("rawVersion").Contains("-beta") Then - StdVersion = Token("version").ToString() - "-beta" + Dim rawVersion As String = Token("rawVersion") + If rawVersion.Contains("-beta") Then + StdVersion = Token("version").ToString().Replace("-beta", "") IsBeta = True Else StdVersion = Token("version").ToString() IsBeta = False End If - Name = Token("rawVersion") + Name = rawVersion Dim Inherit As String = Token("mcversion") Dim Entry = New DlNeoForgeVersionEntry With {.Version = Name, .Inherit = Inherit, .IsBeta = IsBeta, .StdVersion = StdVersion} Versions.Add(Entry) Next Catch ex As Exception + MyMsgBox(ex.ToString(), "错误") Throw New Exception("版本列表解析失败（" & Json.ToString & "）", ex) End Try If Not Versions.Any() Then Throw New Exception("没有可用版本") diff --git a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb index ac13c41..f294d67 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb @@ -2257,7 +2257,7 @@ Retry: Public Function NeoForgeDownloadListItem(Entry As DlNeoForgeVersionEntry, OnClick As MyListItem.ClickEventHandler, IsSaveOnly As Boolean) As MyListItem '建立控件 Dim NewItem As New MyListItem With { - .Title = If(Entry.IsBeta, Entry.Version & "-beta", Entry.Version), .SnapsToDevicePixels = True, .Height = 42, .Type = MyListItem.CheckType.Clickable, .Tag = Entry, + .Title = Entry.Version, .SnapsToDevicePixels = True, .Height = 42, .Type = MyListItem.CheckType.Clickable, .Tag = Entry, .Info = If(Entry.IsBeta, "测试版", "稳定版") & If(Entry.ReleaseTime = "", If(ModeDebug, "种类：" & Entry.Category & If(Entry.Branch Is Nothing, "", "，开发分支：" & Entry.Branch), ""),