Merge pull request #6262 from PCL-Community/fix#6230

fix(ModDownload): 愚人节版本无法下载 NeoForge

Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb

@@ -804,6 +804,10 @@
                 VersionName = ApiName.Replace("1.20.1-", "")
                 Version = New Version("19." & VersionName)
                 Inherit = "1.20.1"
+            ElseIf ApiName.StartsWith("0.") Then '0.25w14craftmine.3-beta
+                VersionName = ApiName
+                Version = New Version("0.0." & ApiName.BeforeFirst("-").AfterFirst(".").AfterFirst(".") & ".0") 'Minor 里有字母，但 Version 类的 Minor 是 Int 类型，只能这样写了
+                Inherit = ApiName.BeforeFirst("-").AfterFirst(".").BeforeFirst(".")
             Else '20.4.30-beta
                 VersionName = ApiName
                 Version = New Version(ApiName.BeforeFirst("-"))
@@ -874,7 +878,7 @@
 
     Private Function GetNeoForgeEntries(LatestJson As String, LatestLegacyJson As String) As List(Of DlNeoForgeListEntry)
         Dim VersionNames = RegexSearch(LatestLegacyJson & LatestJson,
-            "(?<="")(1\.20\.1-)?\d+\.\d+\.\d+(-beta)?(?="")") '我寻思直接正则就行.jpg
+            "(?<="")(?:(1\.20\.1-)?\d+\.\d+\.\d+|0\.[^.]+\.\d+)(-beta)?(?="")") '我寻思直接正则就行.jpg
         Dim Versions = VersionNames.
             Where(Function(name) name <> "47.1.82"). '这个版本虽然在版本列表中，但不能下载
             Select(Function(name) New DlNeoForgeListEntry(name)).ToList

Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb

@@ -364,25 +364,21 @@
             LabForge.Foreground = ColorGray1
         End If
         'NeoForge
-        If Not SelectedMinecraftId.Contains("1.") OrElse Val(SelectedMinecraftId.Split(".")(1)) <= 19 Then
-            CardNeoForge.Visibility = Visibility.Collapsed
+        CardNeoForge.Visibility = Visibility.Visible
+        Dim NeoForgeError As String = LoadNeoForgeGetError()
+        CardNeoForge.MainSwap.Visibility = If(NeoForgeError Is Nothing, Visibility.Visible, Visibility.Collapsed)
+        If NeoForgeError IsNot Nothing Then CardNeoForge.IsSwapped = True
+        SetNeoForgeInfoShow(CardNeoForge.IsSwapped)
+        If SelectedNeoForge Is Nothing Then
+            BtnNeoForgeClear.Visibility = Visibility.Collapsed
+            ImgNeoForge.Visibility = Visibility.Collapsed
+            LabNeoForge.Text = If(NeoForgeError, "可以添加")
+            LabNeoForge.Foreground = ColorGray4
         Else
-            CardNeoForge.Visibility = Visibility.Visible
-            Dim NeoForgeError As String = LoadNeoForgeGetError()
-            CardNeoForge.MainSwap.Visibility = If(NeoForgeError Is Nothing, Visibility.Visible, Visibility.Collapsed)
-            If NeoForgeError IsNot Nothing Then CardNeoForge.IsSwapped = True
-            SetNeoForgeInfoShow(CardNeoForge.IsSwapped)
-            If SelectedNeoForge Is Nothing Then
-                BtnNeoForgeClear.Visibility = Visibility.Collapsed
-                ImgNeoForge.Visibility = Visibility.Collapsed
-                LabNeoForge.Text = If(NeoForgeError, "可以添加")
-                LabNeoForge.Foreground = ColorGray4
-            Else
-                BtnNeoForgeClear.Visibility = Visibility.Visible
-                ImgNeoForge.Visibility = Visibility.Visible
-                LabNeoForge.Text = SelectedNeoForge.VersionName
-                LabNeoForge.Foreground = ColorGray1
-            End If
+            BtnNeoForgeClear.Visibility = Visibility.Visible
+            ImgNeoForge.Visibility = Visibility.Visible
+            LabNeoForge.Text = SelectedNeoForge.VersionName
+            LabNeoForge.Foreground = ColorGray1
         End If
         'Fabric
         If SelectedMinecraftId.Contains("1.") AndAlso Val(SelectedMinecraftId.Split(".")(1)) <= 13 Then
@@ -918,7 +914,6 @@
     ''' 获取 NeoForge 的加载异常信息。若正常则返回 Nothing。
     ''' </summary>
     Private Function LoadNeoForgeGetError() As String
-        If Not SelectedMinecraftId.StartsWith("1.") Then Return "不可用"
         If SelectedOptiFine IsNot Nothing Then Return "与 OptiFine 不兼容"
         If SelectedForge IsNot Nothing Then Return "与 Forge 不兼容"
         If SelectedFabric IsNot Nothing Then Return "与 Fabric 不兼容"