Ver Fonte

fix: 所有版本都显示为测试版 / 正式版

Pigeon0v0 há 2 anos atrás
pai
commit
d8fe599739

+ 5 - 3
Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb

@@ -880,19 +880,21 @@
                 Dim Name As String               '存储 rawVersion,貌似变化更加频繁
                 Dim Name As String               '存储 rawVersion,貌似变化更加频繁
                 Dim StdVersion As String         '存储 version,相对规则
                 Dim StdVersion As String         '存储 version,相对规则
                 Dim IsBeta As Boolean
                 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
                     IsBeta = True
                 Else
                 Else
                     StdVersion = Token("version").ToString()
                     StdVersion = Token("version").ToString()
                     IsBeta = False
                     IsBeta = False
                 End If
                 End If
-                Name = Token("rawVersion")
+                Name = rawVersion
                 Dim Inherit As String = Token("mcversion")
                 Dim Inherit As String = Token("mcversion")
                 Dim Entry = New DlNeoForgeVersionEntry With {.Version = Name, .Inherit = Inherit, .IsBeta = IsBeta, .StdVersion = StdVersion}
                 Dim Entry = New DlNeoForgeVersionEntry With {.Version = Name, .Inherit = Inherit, .IsBeta = IsBeta, .StdVersion = StdVersion}
                 Versions.Add(Entry)
                 Versions.Add(Entry)
             Next
             Next
         Catch ex As Exception
         Catch ex As Exception
+            MyMsgBox(ex.ToString(), "错误")
             Throw New Exception("版本列表解析失败(" & Json.ToString & ")", ex)
             Throw New Exception("版本列表解析失败(" & Json.ToString & ")", ex)
         End Try
         End Try
         If Not Versions.Any() Then Throw New Exception("没有可用版本")
         If Not Versions.Any() Then Throw New Exception("没有可用版本")

+ 1 - 1
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
     Public Function NeoForgeDownloadListItem(Entry As DlNeoForgeVersionEntry, OnClick As MyListItem.ClickEventHandler, IsSaveOnly As Boolean) As MyListItem
         '建立控件
         '建立控件
         Dim NewItem As New MyListItem With {
         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, "测试版", "稳定版") &
             .Info = If(Entry.IsBeta, "测试版", "稳定版") &
                 If(Entry.ReleaseTime = "",
                 If(Entry.ReleaseTime = "",
                 If(ModeDebug, "种类:" & Entry.Category & If(Entry.Branch Is Nothing, "", ",开发分支:" & Entry.Branch), ""),
                 If(ModeDebug, "种类:" & Entry.Category & If(Entry.Branch Is Nothing, "", ",开发分支:" & Entry.Branch), ""),