From 66182f2cd0e1f373d7eb519298504703ded03a45 Mon Sep 17 00:00:00 2001 From: Pigeon0v0 Date: Sun, 16 Jun 2024 14:41:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Icon=20=E6=98=BE=E7=A4=BA=E5=8F=8A?= =?UTF-8?q?=E5=85=B6=E5=AF=BC=E8=87=B4=E7=9A=84=E5=B4=A9=E6=BA=83=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20fix:=201.20.1=20NeoForge=20=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=8B=BC=E6=8E=A5=E9=94=99=E8=AF=AF=20fix:?= =?UTF-8?q?=20=E8=87=AA=E5=8A=A8=E5=AE=89=E8=A3=85=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E9=80=89=E6=8B=A9=20NeoForge=20=E5=90=8E=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E4=BA=86=20rawVersion=20=E4=BD=9C=E4=B8=BA=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Images/Icons/NeoForged.png | Bin 4395 -> 1412 bytes .../Images/Icons/NeoForgedLarge.png | Bin 1123 -> 0 bytes .../Modules/Minecraft/ModDownload.vb | 22 ++++++-------- .../Modules/Minecraft/ModMinecraft.vb | 8 ++--- .../Pages/PageDownload/ModDownloadLib.vb | 28 ++++++++++++++---- .../PageDownload/PageDownloadInstall.xaml | 2 +- .../PageDownload/PageDownloadInstall.xaml.vb | 4 +-- .../Plain Craft Launcher 2.vbproj | 5 ++-- 8 files changed, 41 insertions(+), 28 deletions(-) delete mode 100644 Plain Craft Launcher 2/Images/Icons/NeoForgedLarge.png diff --git a/Plain Craft Launcher 2/Images/Icons/NeoForged.png b/Plain Craft Launcher 2/Images/Icons/NeoForged.png index a9f8076f3d25782eb7fc55f0ef491ecba1c13eed..7d46d392e44d7b7007041bb213ddc4540925b33f 100644 GIT binary patch delta 1393 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 diff --git a/Plain Craft Launcher 2/Images/Icons/NeoForgedLarge.png b/Plain Craft Launcher 2/Images/Icons/NeoForgedLarge.png deleted file mode 100644 index 55848a69dfab001562da00828f41574339f6910f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1123 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrU=i?iaSW-L^JcES$CN^e3<0}fkT0hsRLrzJF^SY&)I(cI=d$AZkF-tHEUvWa_bAfKf1Z#HQ)UGDQU*W#%bRk zoO-(8xOKrU>leE;Hp$!1p80)N^#ycG?-+hKyZUz8$D~GK2-l#p#C!Fq(uzFRAMYF+9yUetiCwpdAE)Kooc3yh@t$tba&D?jtReXIH z)Bbyg+SBajtey3bcg=Lom2f`pk{|rSksaz^B(L8&&$uV@{^97K?`F&{TK`sl`(}P; zVaMm!uKg*HzieZiJ^$s^M{AcYo>#ANZ&k&czcXfH1l}FP4FX$2eP`Xwxi4v)oi)dJ zv*^jL1yPe`MjD^C*t#Y3X8N+tr<<}mn@SB>8c~8%=ck0k)|uYdZaj`L6bzsHdE=Zc zXLKiart;|Qy_uO7_&C@(>%y63mlvmf`+Du5YuI=7`*V8dA3wGD`$zpW+U$vnByQg?WI$BiGU_BZ!S`>0%- z;d$jn>cd<;P@D;D<&`bV%ijIRg#8J!X_yn-Im(jY!O$C zZlYhOc-43QrvL5p=1uu&cNs0|Go->ickVo}RQUg2nCrH|IoBl$9a4C2)i1Kvxb6Mw<&;$S!O7GzS diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb index 69e2308..9b4a693 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb @@ -771,7 +771,7 @@ Public Value As JObject End Structure ''' - ''' 是否为新版 Forge。（即为 Minecraft 1.13+） + ''' 是否为新版 NeoForge。（即为 Minecraft 1.13+） ''' Public ReadOnly Property IsNewType As Boolean Get @@ -804,21 +804,17 @@ ''' Public ReadOnly Property FileName As String Get - Return "neoforge-" & StdVersion & If(IsBeta, "-beta", "") & "-" & "installer" & "." & "jar" + If StdVersion.StartsWith("47.") Then 'NeoForge 1.20.1 的版本命名有些特殊... + Return "forge-" & Inherit & "-" & StdVersion & If(IsBeta, "-beta", "") & "-" & "installer" & "." & "jar" + Else + Return "neoforge-" & StdVersion & If(IsBeta, "-beta", "") & "-" & "installer" & "." & "jar" + End If End Get End Property ''' ''' 文件扩展名。 ''' - Public ReadOnly Property FileSuffix As String - Get - If Category = "installer" Then - Return "jar" - Else - Return "jar" - End If - End Get - End Property + Public FileSuffix As String = "jar" End Class ''' ''' NeoForge 版本列表，主加载器。 @@ -882,10 +878,10 @@ Dim IsBeta As Boolean Dim rawVersion As String = Token("rawVersion") If rawVersion.Contains("-beta") Then - StdVersion = Token("version").ToString().Replace("neoforge-", "").Replace("-beta", "") + StdVersion = Token("version").ToString().Replace("neoforge-", "").Replace("-beta", "").Replace("1.20.1-", "") IsBeta = True Else - StdVersion = Token("version").ToString().Replace("neoforge-", "") + StdVersion = Token("version").ToString().Replace("neoforge-", "").Replace("1.20.1-", "") IsBeta = False End If Name = rawVersion diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb index efb1dfb..f1cdb96 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb @@ -736,12 +736,12 @@ Recheck: If Version.ForgeVersion Is Nothing Then Version.ForgeVersion = RegexSeek(RealJson, "(?<=net\.minecraftforge:minecraftforge:)[0-9\.]+") If Version.ForgeVersion Is Nothing Then Version.ForgeVersion = If(RegexSeek(RealJson, "(?<=net\.minecraftforge:fmlloader:[0-9\.]+-)[0-9\.]+"), "未知版本") Version.HasForge = True - ElseIf RealJson.Contains("neoforge") Then - State = McVersionState.NeoForge - Dim JsonStr1() As String = RealJson.Replace(" ", "").Split("""--fml.neoForgeVersion""," & vbCrLf & """") '这里的实现比较抽象，正则我写不会 + ElseIf RealJson.Contains("neoforge") Then '1.20.1 NeoForge Json 内信息不同，为了方便直接截断 orgeVersion；这里的实现比较抽象，正则我写不会 + State = McVersionState.NeoForge '1.20.1 Json 标识："--fml.forgeVersion" 1.20.1 以上 Json 标识："--fml.neoForgeVersion" + Dim JsonStr1() As String = RealJson.Replace(" ", "").Split("orgeVersion""," & vbCrLf & """") Dim JsonStr2() As String = JsonStr1(1).Split("""") Version.NeoForgeVersion = JsonStr2(0) - If Version.NeoForgeVersion Is Nothing Then Version.NeoForgeVersion = RegexSeek(RealJson, "(?<=""--fml.neoForgeVersion"",)[0-9\.]+") + If Version.NeoForgeVersion Is Nothing Then Version.NeoForgeVersion = RegexSeek(RealJson, "(?<=orgeVersion"",)[0-9\.]+") If Version.NeoForgeVersion Is Nothing Then Version.NeoForgeVersion = If(RegexSeek(RealJson, "(?<=net\.minecraftforge:fmlloader:[0-9\.]+-)[0-9\.]+"), "未知版本") Version.HasNeoForge = True End If diff --git a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb index c0e083c..0ccffe1 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb @@ -1782,10 +1782,17 @@ Retry: Loaders.Add(New LoaderTask(Of DlNeoForgeVersionEntry, List(Of NetFile))("获取下载地址", Sub(Task As LoaderTask(Of DlNeoForgeVersionEntry, List(Of NetFile))) Dim Files As New List(Of NetFile) - Files.Add(New NetFile({ - "https://bmclapi2.bangbang93.com/maven/net/neoforged/neoforge/" & DownloadInfo.StdVersion & "/" & DownloadInfo.FileName, - "https://maven.neoforged.net/releases/net/neoforged/neoforge/" & DownloadInfo.StdVersion & "/" & DownloadInfo.FileName + If DownloadInfo.StdVersion.StartsWith("47.") Then '1.20.1 NeoForge 下载地址不同 + Files.Add(New NetFile({ + "https://bmclapi2.bangbang93.com/maven/net/neoforged/forge/" & "1.20.1-" & DownloadInfo.StdVersion & If(DownloadInfo.IsBeta, "-beta", "") & "/" & DownloadInfo.FileName, + "https://maven.neoforged.net/releases/net/neoforged/forge/" & "1.20.1-" & DownloadInfo.StdVersion & If(DownloadInfo.IsBeta, "-beta", "") & "/" & DownloadInfo.FileName }, Target, New FileChecker(MinSize:=64 * 1024, Hash:=DownloadInfo.Hash))) + Else + Files.Add(New NetFile({ + "https://bmclapi2.bangbang93.com/maven/net/neoforged/neoforge/" & DownloadInfo.StdVersion & If(DownloadInfo.IsBeta, "-beta", "") & "/" & DownloadInfo.FileName, + "https://maven.neoforged.net/releases/net/neoforged/neoforge/" & DownloadInfo.StdVersion & If(DownloadInfo.IsBeta, "-beta", "") & "/" & DownloadInfo.FileName + }, Target, New FileChecker(MinSize:=64 * 1024, Hash:=DownloadInfo.Hash))) + End If Task.Output = Files End Sub) With {.ProgressWeight = 0.1, .Show = False}) '下载 @@ -2005,11 +2012,20 @@ Retry: If IsCustomFolder Then Throw New Exception("如果没有指定原版下载器，则不能指定 MC 安装文件夹") ClientDownloadLoader = McDownloadClient(NetPreDownloadBehaviour.ExitWhileExistsOrDownloading, Inherit) End If - '添加主文件 - Dim Files As New List(Of NetFile) From {New NetFile({ + Dim Files + If DownloadInfo.StdVersion.StartsWith("47.") Then '1.20.1 NeoForge 下载地址不同 + Dim FilesLegacy As New List(Of NetFile) From {New NetFile({ + "https://bmclapi2.bangbang93.com/maven/net/neoforged/forge/" & "1.20.1-" & DownloadInfo.StdVersion & If(DownloadInfo.IsBeta, "-beta", "") & "/" & DownloadInfo.FileName, + "https://maven.neoforged.net/releases/net/neoforged/forge/" & "1.20.1-" & DownloadInfo.StdVersion & If(DownloadInfo.IsBeta, "-beta", "") & "/" & DownloadInfo.FileName + }, InstallerAddress, New FileChecker(MinSize:=64 * 1024, Hash:=DownloadInfo.Hash))} + Files = FilesLegacy + Else + Dim FilesLatest As New List(Of NetFile) From {New NetFile({ "https://bmclapi2.bangbang93.com/maven/net/neoforged/neoforge/" & DownloadInfo.StdVersion & If(DownloadInfo.IsBeta, "-beta", "") & "/" & DownloadInfo.FileName, "https://maven.neoforged.net/releases/net/neoforged/neoforge/" & DownloadInfo.StdVersion & If(DownloadInfo.IsBeta, "-beta", "") & "/" & DownloadInfo.FileName }, InstallerAddress, New FileChecker(MinSize:=64 * 1024, Hash:=DownloadInfo.Hash))} + Files = FilesLatest + End If Task.Output = Files End Sub) With {.ProgressWeight = 0.5, .Show = False}) Loaders.Add(New LoaderDownload("下载 Mod 加载器主文件", New List(Of NetFile)) With {.ProgressWeight = 9}) @@ -2196,7 +2212,7 @@ Retry: If(Entry.ReleaseTime = "", If(ModeDebug, If(Entry.Category IsNot Nothing, "种类：" & Entry.Category, "") & If(Entry.Branch Is Nothing, "", "，开发分支：" & Entry.Branch), ""), "发布于 " & Entry.ReleaseTime & If(ModeDebug, "，种类：" & Entry.Category & If(Entry.Branch Is Nothing, "", "，开发分支：" & Entry.Branch), "")), - .Logo = PathImage & "Blocks/NeoForge.png" + .Logo = PathImage & "Icons/NeoForged.png" } AddHandler NewItem.Click, OnClick '建立菜单 diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml index 1cf0a2d..b16b864 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml @@ -89,7 +89,7 @@ - + diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index 326a03c..6fd4e6e 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -384,7 +384,7 @@ Else BtnNeoForgeClear.Visibility = Visibility.Visible ImgNeoForge.Visibility = Visibility.Visible - LabNeoForge.Text = SelectedNeoForge.Version + LabNeoForge.Text = SelectedNeoForge.StdVersion & If(SelectedNeoForge.IsBeta, "-beta", "") LabNeoForge.Foreground = ColorGray1 End If 'Fabric @@ -541,7 +541,7 @@ ElseIf SelectedForge IsNot Nothing Then Return "pack://application:,,,/images/Blocks/Anvil.png" ElseIf SelectedNeoForge IsNot Nothing Then - Return "pack://application:,,,/images/Blocks/NeoForge.png" + Return "pack://application:,,,/images/Icons/NeoForged.png" ElseIf SelectedLiteLoader IsNot Nothing Then Return "pack://application:,,,/images/Blocks/Egg.png" ElseIf SelectedOptiFine IsNot Nothing Then diff --git a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj index 41f804e..663d1ee 100644 --- a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj +++ b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj @@ -757,7 +757,6 @@ - @@ -924,6 +923,8 @@ - + + + \ No newline at end of file