From 7a7370582cccec032983affe722278599636ae9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=B3=E7=B3=96=E9=85=B8=E8=8F=8C?= Date: Mon, 8 Jul 2024 04:07:18 +0800 Subject: [PATCH 1/7] Update ModModpack.vb --- Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb index 293af35..43e8e70 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb @@ -195,7 +195,7 @@ Retry: End If Try Log("[ModPack] 整合包 Forge 版本：" & Id) - ForgeVersion = Id.Split("-")(1) + ForgeVersion = Id.Remove(0, 6) Exit For Catch ex As Exception Log(ex, "读取整合包 Forge 版本失败：" & Id) @@ -204,7 +204,7 @@ Retry: 'NeoForge 指定 Try Log("[ModPack] 整合包 NeoForge 版本：" & Id) - NeoForgeVersion = Id.Split("-")(1) + NeoForgeVersion = Id.Remove(0, 9) Exit For Catch ex As Exception Log(ex, "读取整合包 NeoForge 版本失败：" & Id) @@ -213,7 +213,7 @@ Retry: 'Fabric 指定 Try Log("[ModPack] 整合包 Fabric 版本：" & Id) - FabricVersion = Id.Split("-")(1) + FabricVersion = Id.Remove(0, 7) Exit For Catch ex As Exception Log(ex, "读取整合包 Fabric 版本失败：" & Id) From 9ab43a72f2081f0720ca4c4d05030895cbcef496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=B3=E7=B3=96=E9=85=B8=E8=8F=8C?= Date: Tue, 9 Jul 2024 00:25:22 +0800 Subject: [PATCH 2/7] Update PageDownloadInstall.xaml.vb Fix #4202 --- .../Pages/PageDownload/PageDownloadInstall.xaml.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index 1304527..cf63dcb 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -724,6 +724,7 @@ Private Function IsOptiFineSuitForForge(OptiFine As DlOptiFineListEntry, Forge As DlForgeVersionEntry) If Forge.Inherit <> OptiFine.Inherit Then Return False '不是同一个大版本 If OptiFine.RequiredForgeVersion Is Nothing Then Return False '不兼容 Forge + If OptiFine.RequiredForgeVersion = "" Then Return True If OptiFine.RequiredForgeVersion.Contains(".") Then 'XX.X.XXX Return VersionSortInteger(Forge.Version.ToString, OptiFine.RequiredForgeVersion) >= 0 Else 'XXXX From f68978f7d8e15d9b7594793eeedf35ecb413d153 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=B3=E7=B3=96=E9=85=B8=E8=8F=8C?= Date: Wed, 10 Jul 2024 18:41:45 +0800 Subject: [PATCH 3/7] Update PageDownloadInstall.xaml.vb removed extra space --- .../Pages/PageDownload/PageDownloadInstall.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index cf63dcb..9d05282 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -724,7 +724,7 @@ Private Function IsOptiFineSuitForForge(OptiFine As DlOptiFineListEntry, Forge As DlForgeVersionEntry) If Forge.Inherit <> OptiFine.Inherit Then Return False '不是同一个大版本 If OptiFine.RequiredForgeVersion Is Nothing Then Return False '不兼容 Forge - If OptiFine.RequiredForgeVersion = "" Then Return True + If OptiFine.RequiredForgeVersion = "" Then Return True If OptiFine.RequiredForgeVersion.Contains(".") Then 'XX.X.XXX Return VersionSortInteger(Forge.Version.ToString, OptiFine.RequiredForgeVersion) >= 0 Else 'XXXX From 8ea99d21bebc3e450a61180a27e676082e92e3f9 Mon Sep 17 00:00:00 2001 From: killcerr Date: Wed, 10 Jul 2024 19:41:26 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj index 58259ad..c829231 100644 --- a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj +++ b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj @@ -38,7 +38,7 @@ false false true - D:\Minecraft\程序\ + .\Output\ Plain Craft Launcher 2.xml 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314 false @@ -55,7 +55,7 @@ false false true - D:\Minecraft\程序\ + .\Output\ Plain Craft Launcher 2.xml 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314 false @@ -100,7 +100,7 @@ false - D:\Minecraft\程序\ + .\Output\ Plain Craft Launcher 2.xml true 1 @@ -111,7 +111,7 @@ false - D:\Minecraft\程序\ + .\Output\ Plain Craft Launcher 2.xml true 1 @@ -129,7 +129,7 @@ - D:\Minecraft\程序\ + .\Output\ RELEASE,BY_UPDATE Plain Craft Launcher 2.xml true From d108b62eeda9cb1c22035fac916de947f667ce66 Mon Sep 17 00:00:00 2001 From: killcerr <93478098+killcerr@users.noreply.github.com> Date: Wed, 10 Jul 2024 19:44:33 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Output/empty.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Plain Craft Launcher 2/Output/empty.txt diff --git a/Plain Craft Launcher 2/Output/empty.txt b/Plain Craft Launcher 2/Output/empty.txt new file mode 100644 index 0000000..2540025 --- /dev/null +++ b/Plain Craft Launcher 2/Output/empty.txt @@ -0,0 +1 @@ +为了让git创建此文件夹，所以保留此文件 From ea2b7298e92928a2598a12444cf5bbc461a67ec1 Mon Sep 17 00:00:00 2001 From: killcerr <93478098+killcerr@users.noreply.github.com> Date: Wed, 10 Jul 2024 19:57:02 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=BB=9D=E5=AF=B9=E8=B7=AF=E5=BE=84=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Output/empty.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Plain Craft Launcher 2/Output/empty.txt diff --git a/Plain Craft Launcher 2/Output/empty.txt b/Plain Craft Launcher 2/Output/empty.txt deleted file mode 100644 index 2540025..0000000 --- a/Plain Craft Launcher 2/Output/empty.txt +++ /dev/null @@ -1 +0,0 @@ -为了让git创建此文件夹，所以保留此文件 From b8c512c04c49ccb0ae60b3472682212814e3b3fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=B3=E7=B3=96=E9=85=B8=E8=8F=8C?= Date: Thu, 11 Jul 2024 10:36:32 +0800 Subject: [PATCH 7/7] Update ModModpack.vb MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将原先使用的.Remove方法替换为.Replace方法。 --- Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb index 43e8e70..12284ab 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb @@ -195,7 +195,7 @@ Retry: End If Try Log("[ModPack] 整合包 Forge 版本：" & Id) - ForgeVersion = Id.Remove(0, 6) + ForgeVersion = Id.Replace("forge-", "") Exit For Catch ex As Exception Log(ex, "读取整合包 Forge 版本失败：" & Id) @@ -204,7 +204,7 @@ Retry: 'NeoForge 指定 Try Log("[ModPack] 整合包 NeoForge 版本：" & Id) - NeoForgeVersion = Id.Remove(0, 9) + NeoForgeVersion = Id.Replace("neoforge-", "") Exit For Catch ex As Exception Log(ex, "读取整合包 NeoForge 版本失败：" & Id) @@ -213,7 +213,7 @@ Retry: 'Fabric 指定 Try Log("[ModPack] 整合包 Fabric 版本：" & Id) - FabricVersion = Id.Remove(0, 7) + FabricVersion = Id.Replace("fabric-", "") Exit For Catch ex As Exception Log(ex, "读取整合包 Fabric 版本失败：" & Id)