From 40e0afefdd92919ae39a559a61938313db4a0fb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= <188181427+shimoranla@users.noreply.github.com> Date: Mon, 3 Mar 2025 16:30:02 +0800 Subject: [PATCH 01/30] =?UTF-8?q?fix(ModValidate):=E6=9C=AA=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E8=B7=AF=E5=BE=84=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Base/ModValidate.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plain Craft Launcher 2/Modules/Base/ModValidate.vb b/Plain Craft Launcher 2/Modules/Base/ModValidate.vb index 039406074..0dd9352d6 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModValidate.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModValidate.vb @@ -216,6 +216,8 @@ Public Class ValidateFolderName End Sub Public Overrides Function Validate(Str As String) As String Try + '检查是否已存在 + If Not Str = "" AndAlso Directory.Exists($"{Path}\{Str}") Then Return "指定的名称已存在" '检查是否为空 Dim LengthCheck As String = New ValidateNullOrWhiteSpace().Validate(Str) If Not LengthCheck = "" Then Return LengthCheck From 80a004ceefaee837b4013ad5c81b758da9c91253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= <188181427+shimoranla@users.noreply.github.com> Date: Tue, 4 Mar 2025 12:04:17 +0800 Subject: [PATCH 02/30] =?UTF-8?q?fix(BtnDisplayRename=5FClick)=EF=BC=9A?= =?UTF-8?q?=E5=9C=A8=E9=87=8D=E5=91=BD=E5=90=8D=E5=89=8D=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Base/ModValidate.vb | 2 -- .../Pages/PageVersion/PageVersionOverall.xaml.vb | 11 +++++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Base/ModValidate.vb b/Plain Craft Launcher 2/Modules/Base/ModValidate.vb index 0dd9352d6..039406074 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModValidate.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModValidate.vb @@ -216,8 +216,6 @@ Public Class ValidateFolderName End Sub Public Overrides Function Validate(Str As String) As String Try - '检查是否已存在 - If Not Str = "" AndAlso Directory.Exists($"{Path}\{Str}") Then Return "指定的名称已存在" '检查是否为空 Dim LengthCheck As String = New ValidateNullOrWhiteSpace().Validate(Str) If Not LengthCheck = "" Then Return LengthCheck diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb index 7a975a467..08ce7c4ee 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb @@ -124,6 +124,17 @@ Log(ex, "重命名读取 json 时失败") JsonObject = PageVersionLeft.Version.JsonObject End Try + If Directory.Exists(NewPath) OrElse Directory.Exists(TempName) Then + Select Case MyMsgBox("当前文件夹已存在此名称，请重新输入一个有效的名称。", "重命名失败", Button1:="确定", Button2:="取消") + Case 1 + GoTo ReType + Case 2 + Exit Sub + End Select + ElseIf Not Directory.Exists($"{PathMcFolder}\versions") Then + MyMsgBox("当前版本文件夹无效，请检查版本文件夹。", "重命名失败") + Exit Sub + End If '重命名主文件夹 My.Computer.FileSystem.RenameDirectory(OldPath, TempName) My.Computer.FileSystem.RenameDirectory(TempPath, NewName) From da6b64c9bcb449fd1da2d874211c9316d88fb6d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= <188181427+shimoranla@users.noreply.github.com> Date: Tue, 4 Mar 2025 12:30:43 +0800 Subject: [PATCH 03/30] =?UTF-8?q?fix(btnDisplayDesc=5FClick):=E5=B0=91?= =?UTF-8?q?=E4=BA=86=E4=B8=AA=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/PageVersion/PageVersionOverall.xaml.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb index 08ce7c4ee..e2b8f3c15 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb @@ -108,6 +108,7 @@ '确认输入的新名称 Dim OldName As String = PageVersionLeft.Version.Name Dim OldPath As String = PageVersionLeft.Version.Path +ReType: '修改此部分的同时修改快速安装的版本名检测* Dim NewName As String = MyMsgBoxInput("重命名版本", "", OldName, New ObjectModel.Collection(Of Validate) From {New ValidateFolderName(PathMcFolder & "versions", IgnoreCase:=False)}) If String.IsNullOrWhiteSpace(NewName) Then Exit Sub From 287d3aeb458e34b136642325e86065135d27fa7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= <188181427+shimoranla@users.noreply.github.com> Date: Tue, 4 Mar 2025 21:47:43 +0800 Subject: [PATCH 04/30] =?UTF-8?q?fix(ModJava):=E6=8E=92=E9=99=A4=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E7=9B=AE=E5=BD=95=E7=9A=84=20Java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb index 3d54dfcd2..93f309af3 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb @@ -372,6 +372,7 @@ ExitUserJavaCheck: For Each Java In AllowedJavaList '如果在官启文件夹启动，会将官启自带 Java 错误视作 MC 文件夹指定 Java，导致了 #2054 的第二例 If Java.PathFolder.Contains(".minecraft\cache\java") Then Continue For + If Java.PathFolder.Contains("PCL\MyDownload") Then Continue For If TargetJavaList.Contains(Java) Then '直接使用指定的 Java AllowedJavaList = New List(Of JavaEntry) From {Java} From 045c378526cc8c8ba351fdacdd5efb6b7dab01fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= <188181427+shimoranla@users.noreply.github.com> Date: Tue, 4 Mar 2025 21:57:38 +0800 Subject: [PATCH 05/30] =?UTF-8?q?chore(ModJava):=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb index 93f309af3..7e0ab4f85 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb @@ -372,6 +372,7 @@ ExitUserJavaCheck: For Each Java In AllowedJavaList '如果在官启文件夹启动，会将官启自带 Java 错误视作 MC 文件夹指定 Java，导致了 #2054 的第二例 If Java.PathFolder.Contains(".minecraft\cache\java") Then Continue For + '#5780，可能存在误操作导致 Java 被解压到此路径，然后被 PCL 优先选择 If Java.PathFolder.Contains("PCL\MyDownload") Then Continue For If TargetJavaList.Contains(Java) Then '直接使用指定的 Java From 7c3d820f125ae0a40a2b7191792b2d2edb9a5aad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= <188181427+shimoranla@users.noreply.github.com> Date: Tue, 4 Mar 2025 21:59:30 +0800 Subject: [PATCH 06/30] =?UTF-8?q?chore(ModJava):=E5=88=A0=E6=8E=89?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E8=AE=A9=E9=BE=99=E7=8C=AB=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb index 7e0ab4f85..9abb7fef5 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb @@ -372,7 +372,7 @@ ExitUserJavaCheck: For Each Java In AllowedJavaList '如果在官启文件夹启动，会将官启自带 Java 错误视作 MC 文件夹指定 Java，导致了 #2054 的第二例 If Java.PathFolder.Contains(".minecraft\cache\java") Then Continue For - '#5780，可能存在误操作导致 Java 被解压到此路径，然后被 PCL 优先选择 + '#5780 If Java.PathFolder.Contains("PCL\MyDownload") Then Continue For If TargetJavaList.Contains(Java) Then '直接使用指定的 Java From 16755cd4a947d76bbf1b89c5007b8ee84cfebd81 Mon Sep 17 00:00:00 2001 From: Open-KFC <1811593346@qq.com> Date: Fri, 7 Mar 2025 03:43:21 +0800 Subject: [PATCH 07/30] =?UTF-8?q?fix=20#5655:=20=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E7=A7=BB=E5=8A=A8=E6=97=B6=E6=8A=AC=E8=B5=B7?= =?UTF-8?q?=E4=BB=8D=E5=8F=AF=E7=BB=A7=E7=BB=AD=E6=94=B9=E5=8F=98=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Controls/MyResizer.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Controls/MyResizer.vb b/Plain Craft Launcher 2/Controls/MyResizer.vb index e0c21eda5..1200a4bae 100644 --- a/Plain Craft Launcher 2/Controls/MyResizer.vb +++ b/Plain Craft Launcher 2/Controls/MyResizer.vb @@ -301,7 +301,7 @@ Public Class MyResizer End Sub Private Sub updateMouseDown() - Dim flag As Boolean = Mouse.LeftButton = MouseButtonState.Released + Dim flag = (GetAsyncKeyState(&H1) And &H8000) = 0 '调用原生API判断鼠标是否抬起，如果使用WPF的API的话鼠标不在窗口上时不会更新状态 (#5655) If flag Then resizeRight = False resizeLeft = False @@ -312,4 +312,5 @@ Public Class MyResizer Private Declare Function GetCursorPos Lib "user32.dll" ( ByRef lpPoint As PointAPI) As Boolean + Private Declare Function GetAsyncKeyState Lib "user32.dll" (vKey As Integer) As Short End Class From 92eeba5fff6cf1cc2113d1b3ebc6a3fa5a389041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Mon, 17 Mar 2025 12:01:47 +0800 Subject: [PATCH 08/30] =?UTF-8?q?fix(MyMsgInput):validate=20=E8=BE=93?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 不要相信用户输入 --- .../Controls/MyMsg/MyMsgInput.xaml.vb | 1 + .../Pages/PageVersion/PageVersionOverall.xaml.vb | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb b/Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb index 56ae47522..e0bf5b8f7 100644 --- a/Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb +++ b/Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb @@ -72,6 +72,7 @@ End Sub Public Sub Btn1_Click() Handles Btn1.Click + TextArea.Validate() If MyConverter.IsExited OrElse Not TextArea.ValidateResult = "" Then Exit Sub MyConverter.IsExited = True MyConverter.Result = TextArea.Text diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb index e2b8f3c15..ed925e5f8 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb @@ -125,17 +125,6 @@ ReType: Log(ex, "重命名读取 json 时失败") JsonObject = PageVersionLeft.Version.JsonObject End Try - If Directory.Exists(NewPath) OrElse Directory.Exists(TempName) Then - Select Case MyMsgBox("当前文件夹已存在此名称，请重新输入一个有效的名称。", "重命名失败", Button1:="确定", Button2:="取消") - Case 1 - GoTo ReType - Case 2 - Exit Sub - End Select - ElseIf Not Directory.Exists($"{PathMcFolder}\versions") Then - MyMsgBox("当前版本文件夹无效，请检查版本文件夹。", "重命名失败") - Exit Sub - End If '重命名主文件夹 My.Computer.FileSystem.RenameDirectory(OldPath, TempName) My.Computer.FileSystem.RenameDirectory(TempPath, NewName) From 44be631d4a4fb8d3c9448838601752191a14e84f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Fri, 21 Mar 2025 07:36:59 +0800 Subject: [PATCH 09/30] =?UTF-8?q?fix(PageSetupUI):=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml index 3a4cc1fd1..28332fde6 100644 --- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml +++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml @@ -282,7 +282,7 @@ - + From d1d19a4bb3e6f7df53db4be5d221c3ddf4bdd0b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Sat, 22 Mar 2025 09:14:23 +0800 Subject: [PATCH 10/30] =?UTF-8?q?fix(ModBase):=E5=8A=A0=E4=B8=AA=20Try=20C?= =?UTF-8?q?atch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Base/ModBase.vb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb index 8baed4ab1..ff4406199 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModBase.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModBase.vb @@ -2333,10 +2333,14 @@ NextElement: Public Sub ShellOnly(FileName As String, Optional Arguments As String = "") FileName = ShortenPath(FileName) Using Program As New Process - Program.StartInfo.Arguments = Arguments - Program.StartInfo.FileName = FileName - Log("[System] 执行外部命令：" & FileName & " " & Arguments) - Program.Start() + Try + Program.StartInfo.Arguments = Arguments + Program.StartInfo.FileName = FileName + Log("[System] 执行外部命令：" & FileName & " " & Arguments) + Program.Start() + Catch ex As Exception + Log(ex, "执行外部命令失败", LogLevel.Msgbox) + End Try End Using End Sub ''' From 0aabb69e16d87496b9a809216aea4b65f78e83e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Sat, 22 Mar 2025 15:43:56 +0800 Subject: [PATCH 11/30] =?UTF-8?q?fix(ShellOnly):=E5=8F=AA=E4=B8=BA?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=87=BA=E9=94=99=E7=9A=84=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Base/ModBase.vb | 13 +++++-------- .../Modules/Minecraft/ModCrash.vb | 4 ++++ .../Modules/Minecraft/ModModpack.vb | 8 +++++++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb index ff4406199..09aaea349 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModBase.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModBase.vb @@ -2333,14 +2333,11 @@ NextElement: Public Sub ShellOnly(FileName As String, Optional Arguments As String = "") FileName = ShortenPath(FileName) Using Program As New Process - Try - Program.StartInfo.Arguments = Arguments - Program.StartInfo.FileName = FileName - Log("[System] 执行外部命令：" & FileName & " " & Arguments) - Program.Start() - Catch ex As Exception - Log(ex, "执行外部命令失败", LogLevel.Msgbox) - End Try + Program.StartInfo.Arguments = Arguments + Program.StartInfo.FileName = FileName + Log("[System] 执行外部命令：" & FileName & " " & Arguments) + Program.Start() + End Using End Sub ''' diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb index 009369197..b380b0fd8 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb @@ -857,6 +857,7 @@ NextStack: "确定", If(IsHandAnalyze OrElse DirectFile Is Nothing, "", "查看日志"), If(IsHandAnalyze, "", "导出错误报告"), Button2Action:=If(IsHandAnalyze OrElse DirectFile Is Nothing, Nothing, Sub() + Try '弹窗选择：查看日志 If File.Exists(DirectFile.Value.Key) Then ShellOnly(DirectFile.Value.Key) @@ -865,6 +866,9 @@ NextStack: WriteFile(FilePath, Join(DirectFile.Value.Value, vbCrLf)) ShellOnly(FilePath) End If + Catch ex As Exception + Log(ex,"尝试打开文件失败",LogLevel.Hint) + End Try End Sub)) Case 3 '弹窗选择：导出错误报告 diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb index 1d8dc13d3..7b1e0f753 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb @@ -828,7 +828,13 @@ Retry: Log("[Modpack] 找到压缩包中附带的启动器：" & Launcher) If MyMsgBox($"整合包里似乎自带了启动器，是否换用它继续安装？{vbCrLf}即将打开：{Launcher}", "换用整合包启动器？", "换用", "不换用") = 1 Then OpenExplorer(TargetFolder) - ShellOnly(Launcher, "--wait") '要求等待已有的 PCL 退出 + Try + ShellOnly(Launcher, "--wait") '要求等待已有的 PCL 退出 + Catch ex As Exception + Log(ex,"打开文件失败",LogLevel.MsgBox) + Finally + Return + End Try Log("[Modpack] 为换用整合包中的启动器启动，强制结束程序") FrmMain.EndProgram(False) Return From 4e144273497935779ce08611f9bde4ae1988c44c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Sat, 22 Mar 2025 15:53:01 +0800 Subject: [PATCH 12/30] =?UTF-8?q?fix(ModModPack):=E8=BF=98=E4=B8=8D?= =?UTF-8?q?=E8=AE=A9=E7=94=A8=20Finally=20=E4=BA=86=E6=98=AF=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb index 7b1e0f753..677cacd95 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb @@ -830,13 +830,11 @@ Retry: OpenExplorer(TargetFolder) Try ShellOnly(Launcher, "--wait") '要求等待已有的 PCL 退出 + Log("[Modpack] 为换用整合包中的启动器启动，强制结束程序") + FrmMain.EndProgram(False) Catch ex As Exception - Log(ex,"打开文件失败",LogLevel.MsgBox) - Finally - Return + Log(ex, "打开文件失败", LogLevel.Msgbox) End Try - Log("[Modpack] 为换用整合包中的启动器启动，强制结束程序") - FrmMain.EndProgram(False) Return End If Else From 7d9923908be3195d7b0c91fc8f74f20dee466be6 Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Wed, 26 Mar 2025 20:19:35 +0800 Subject: [PATCH 13/30] =?UTF-8?q?chore(MySkin):=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B8=B4=E6=9C=9B=E6=8A=AB=E9=A3=8E=E7=9A=84=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Pages/PageLaunch/MySkin.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/MySkin.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/MySkin.xaml.vb index 6de343786..aa0e23a1c 100644 --- a/Plain Craft Launcher 2/Pages/PageLaunch/MySkin.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageLaunch/MySkin.xaml.vb @@ -243,7 +243,7 @@ Retry: {"Minecon2013", "Minecon 2013 参与者披风"}, {"Minecon2015", "Minecon 2015 参与者披风"}, {"Minecon2016", "Minecon 2016 参与者披风"}, {"Cherry Blossom", "樱花披风"}, {"15th Anniversary", "15 周年纪念披风"}, {"Purple Heart", "紫色心形披风"}, {"Follower's", "追随者披风"}, {"MCC 15th Year", "MCC 15 周年披风"}, {"Minecraft Experience", "村民救援披风"}, - {"Mojang Office", "Mojang 办公室披风"} + {"Mojang Office", "Mojang 办公室披风"}, {"Yearn", "渴望披风"} } Dim SelectionControl As New List(Of IMyRadio) From {New MyRadioBox With {.Text = "无披风"}} For Each Cape In SkinData("capes") From 4cd8840385c1954f6ffe00de2201953a9f0339dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Tue, 1 Apr 2025 13:41:30 +0800 Subject: [PATCH 14/30] =?UTF-8?q?style(modbase):=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Base/ModBase.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb index 09aaea349..8baed4ab1 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModBase.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModBase.vb @@ -2337,7 +2337,6 @@ NextElement: Program.StartInfo.FileName = FileName Log("[System] 执行外部命令：" & FileName & " " & Arguments) Program.Start() - End Using End Sub ''' From 9021e9668478ddb5a99adaa1e2b58c0db95d9411 Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Sat, 5 Apr 2025 19:01:32 +0800 Subject: [PATCH 15/30] =?UTF-8?q?fix(FormMain):=202.9.3=20=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/FormMain.xaml.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index 60fe8988e..fa1e8741a 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -10,7 +10,7 @@ Public Class FormMain Dim FeatureList As New List(Of KeyValuePair(Of Integer, String)) '统计更新日志条目 #If BETA Then - If LastVersion < 354 Then 'Release 2.9.3 + If LastVersion < 355 Then 'Release 2.9.3 FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化：Minecraft 会优先使用独立显卡运行")) FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化：简化下载新版本第二步的 UI")) FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化：使用新的版本隔离策略")) @@ -66,7 +66,7 @@ Public Class FormMain '3：BUG+ IMP* FEAT- '2：BUG* IMP- '1：BUG- - If LastVersion < 353 Then 'Snapshot 2.9.3 + If LastVersion < 354 Then 'Snapshot 2.9.3 If LastVersion = 352 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：低版本 MC 没有声音")) FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：若不安装 Mod 加载器，则无法安装 OptiFine 1.14+")) @@ -74,7 +74,7 @@ Public Class FormMain FeatureCount += 8 BugCount += 8 End If - If LastVersion < 352 Then 'Snapshot 2.9.2 + If LastVersion < 353 Then 'Snapshot 2.9.2 FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化：Minecraft 会优先使用独立显卡运行")) FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化：简化下载新版本第二步的 UI")) FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化：使用新的版本隔离策略")) From e038911973c39838e8cccdc63feb6e0a79349aed Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Sun, 6 Apr 2025 00:38:32 +0000 Subject: [PATCH 16/30] =?UTF-8?q?chore:=20=20=E7=AD=9B=E9=80=89=E5=99=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC=201.21.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml | 1 + Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml | 1 + 2 files changed, 2 insertions(+) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml index bcfb63759..822a136c4 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml @@ -33,6 +33,7 @@ + diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml index 5ad426dfb..857776a0b 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml @@ -32,6 +32,7 @@ + From 2f0958afb7e15b13bd9140e4f485199d21a532b4 Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Sun, 6 Apr 2025 20:10:56 +0800 Subject: [PATCH 17/30] =?UTF-8?q?fix(PageVersionExport):=20=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=AF=BC=E5=87=BA=E6=9F=90=E4=BA=9B=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=9A=84=20Xearo=20=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml index 3bbab0c12..46c1ab011 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionExport.xaml @@ -111,7 +111,7 @@ From d915fc2362684c126565a2c020651f198ce8392c Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Wed, 9 Apr 2025 18:21:16 +0800 Subject: [PATCH 18/30] =?UTF-8?q?fix(ModModPack):=20=E8=A7=A3=E5=8E=8B?= =?UTF-8?q?=E5=8E=8B=E7=BC=A9=E5=8C=85=E8=BF=9B=E5=BA=A6=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E8=B6=85=E8=BF=87=20100%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb index 1d8dc13d3..93b11cfc3 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb @@ -115,6 +115,7 @@ Public Module ModModpack Dim Encode = Encoding.GetEncoding("GB18030") Try Retry: + Loader.Progress = 0 '完全不知道为啥会出现文件正在被另一进程使用的问题，总之多试试 DeleteDirectory(InstallTemp) ExtractFile(FileAddress, InstallTemp, Encode, ProgressIncrementHandler:=Sub(Delta) Loader.Progress += Delta * LoaderProgressDelta) From bd24d4c304f92a391da72af73de01c6d8b4a7c9d Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Thu, 10 Apr 2025 16:36:01 +0800 Subject: [PATCH 19/30] =?UTF-8?q?fix(ModModpack):=20=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=80=BC=E4=B8=8D=E4=B8=BA=200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb index 93b11cfc3..ab08f240c 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb @@ -113,9 +113,10 @@ Public Module ModModpack '解压文件 Dim RetryCount As Integer = 1 Dim Encode = Encoding.GetEncoding("GB18030") + Dim InitialProgress = Loader.Progress Try Retry: - Loader.Progress = 0 + Loader.Progress = InitialProgress '完全不知道为啥会出现文件正在被另一进程使用的问题，总之多试试 DeleteDirectory(InstallTemp) ExtractFile(FileAddress, InstallTemp, Encode, ProgressIncrementHandler:=Sub(Delta) Loader.Progress += Delta * LoaderProgressDelta) From a849c3cfd16cfc7a6da1a4d2cbb3c0e948c94772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Fri, 11 Apr 2025 08:49:13 +0800 Subject: [PATCH 20/30] =?UTF-8?q?fix:=E8=AF=86=E5=88=AB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/PageDownload/PageDownloadClient.xaml.vb | 2 +- .../Pages/PageDownload/PageDownloadInstall.xaml.vb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb index b3de19cca..e5167af68 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb @@ -39,7 +39,7 @@ Version("id") = "20w14∞" Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) - Case "3d shareware v1.34", "1.rv-pre1", "15w14a", "2.0", "22w13oneblockatatime", "23w13a_or_b", "24w14potato" + Case "3d shareware v1.34", "1.rv-pre1", "15w14a", "2.0", "22w13oneblockatatime", "23w13a_or_b", "24w14potato","25w14craftmine" Type = "愚人节版" Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb index 4346a465e..ee17cfbb5 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -590,7 +590,7 @@ Version("id") = "20w14∞" Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) - Case "3d shareware v1.34", "1.rv-pre1", "15w14a", "2.0", "22w13oneblockatatime", "23w13a_or_b", "24w14potato" + Case "3d shareware v1.34", "1.rv-pre1", "15w14a", "2.0", "22w13oneblockatatime", "23w13a_or_b", "24w14potato","25w14craftminefix:shi" Type = "愚人节版" Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) From 4ef328e5952485b46e1691d009c0380132babb72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Fri, 11 Apr 2025 17:27:44 +0800 Subject: [PATCH 21/30] =?UTF-8?q?fix:=E7=89=88=E6=9C=AC=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=86=99=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 ee17cfbb5..81b2bc85d 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -590,7 +590,7 @@ Version("id") = "20w14∞" Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) - Case "3d shareware v1.34", "1.rv-pre1", "15w14a", "2.0", "22w13oneblockatatime", "23w13a_or_b", "24w14potato","25w14craftminefix:shi" + Case "3d shareware v1.34", "1.rv-pre1", "15w14a", "2.0", "22w13oneblockatatime", "23w13a_or_b", "24w14potato","25w14craftmine" Type = "愚人节版" Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) From 5302b405b7ecf6345379bdcd24027d2d7a7ccef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Sat, 12 Apr 2025 21:45:14 +0800 Subject: [PATCH 22/30] =?UTF-8?q?style:=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: allMagic <116283787+allMagicNB@users.noreply.github.com> --- .../Pages/PageDownload/PageDownloadClient.xaml.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb index e5167af68..2af82b706 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb @@ -39,7 +39,7 @@ Version("id") = "20w14∞" Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) - Case "3d shareware v1.34", "1.rv-pre1", "15w14a", "2.0", "22w13oneblockatatime", "23w13a_or_b", "24w14potato","25w14craftmine" + Case "3d shareware v1.34", "1.rv-pre1", "15w14a", "2.0", "22w13oneblockatatime", "23w13a_or_b", "24w14potato", "25w14craftmine" Type = "愚人节版" Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) From 683410743abdca071dfdb4a859307fa8ae7c358b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Sat, 12 Apr 2025 21:45:24 +0800 Subject: [PATCH 23/30] =?UTF-8?q?style:=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: allMagic <116283787+allMagicNB@users.noreply.github.com> --- .../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 81b2bc85d..8e9547acb 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb @@ -590,7 +590,7 @@ Version("id") = "20w14∞" Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) - Case "3d shareware v1.34", "1.rv-pre1", "15w14a", "2.0", "22w13oneblockatatime", "23w13a_or_b", "24w14potato","25w14craftmine" + Case "3d shareware v1.34", "1.rv-pre1", "15w14a", "2.0", "22w13oneblockatatime", "23w13a_or_b", "24w14potato", "25w14craftmine" Type = "愚人节版" Version("type") = "special" Version.Add("lore", GetMcFoolName(Version("id"))) From 68f07aa6c244bf649f8c677e8ff3abb0a522fce5 Mon Sep 17 00:00:00 2001 From: Open-KFC <1811593346@qq.com> Date: Sun, 13 Apr 2025 07:31:41 +0800 Subject: [PATCH 24/30] =?UTF-8?q?fix(Setup):=20=E4=B8=8B=E8=BD=BD=E9=80=9F?= =?UTF-8?q?=E5=BA=A6=E9=99=90=E5=88=B6=E7=9A=84=E9=85=8D=E7=BD=AE=E9=A1=B9?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E5=9C=A8=E6=89=93=E5=BC=80=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E6=97=B6=E8=A2=AB=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Application.xaml.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/Plain Craft Launcher 2/Application.xaml.vb b/Plain Craft Launcher 2/Application.xaml.vb index beec27a7c..eddd8d5fd 100644 --- a/Plain Craft Launcher 2/Application.xaml.vb +++ b/Plain Craft Launcher 2/Application.xaml.vb @@ -131,6 +131,7 @@ WaitRetry: Setup.Load("SystemDebugAnim") Setup.Load("ToolDownloadThread") Setup.Load("ToolDownloadCert") + Setup.Load("ToolDownloadSpeed") '网络配置初始化 ServicePointManager.Expect100Continue = True ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3 Or SecurityProtocolType.Tls Or SecurityProtocolType.Tls11 Or SecurityProtocolType.Tls12 From 7cdada22a93b7b1dfac583139ae185504dae75ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Mon, 14 Apr 2025 16:32:18 +0800 Subject: [PATCH 25/30] =?UTF-8?q?chore:=E5=BF=BD=E7=95=A5=20system32=20?= =?UTF-8?q?=E7=9A=84=20Java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb index 05d2c9800..d0cbdb836 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb @@ -555,7 +555,7 @@ NoUserJava: '若不全为特殊引用，则清除特殊引用的地址 Dim JavaWithoutInherit As New Dictionary(Of String, Boolean) For Each Pair In JavaPreList - If Pair.Key.Contains("java8path_target_") OrElse Pair.Key.Contains("javapath_target_") OrElse Pair.Key.Contains("javatmp") Then + If Pair.Key.Contains("java8path_target_") OrElse Pair.Key.Contains("javapath_target_") OrElse Pair.Key.Contains("javatmp") OrElse Pair.Key.ContainsF("system32") Then Log("[Java] 位于 " & Pair.Key & " 的 Java 包含特殊引用") Else Log("[Java] 位于 " & Pair.Key & " 的 Java 不含特殊引用") From dc611a982f8f97fab2c4275d1176db484f8549a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=85=BE=E7=8C=AB=E8=B7=83?= <1043137532@qq.com> Date: Mon, 21 Apr 2025 19:28:20 +0800 Subject: [PATCH 26/30] Update LICENCE --- LICENCE | 54 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/LICENCE b/LICENCE index ba3282faf..00957edec 100644 --- a/LICENCE +++ b/LICENCE @@ -1,26 +1,40 @@ -本文件仅作为指引您合理使用本存储库内容的指南，不是法律文件或协议。 +一、声明 -一、承诺与声明。 +本文件仅作为指南，不是法律文件或协议。但开发者在此承诺，在您遵守本指南且善意、合理使用的情况下，不会追究您的责任。 +法律上，开发者仍保留所有权利（All Rights Reserved），若情况恶劣，仍可能将诉讼作为最终手段。 -　　开发者承诺，在您遵守本指南且善意使用的情况下，不会追究您的责任，但最终裁量权仍由开发者保留。 -　　法律上，开发者仍保留所有权利（All Rights Reserved），且可能随时修改本指南，本指南并不是永久性保证。 -二、少量使用情形。 -　　如果您仅合理使用本存储库中的少量内容，或是参考实现思路，您必须： -　　1、给出适当的署名，且提供指向本存储库的链接。GitHub 上的 Fork 可视为满足此条。 -　　2、不得以任何方式暗示开发者为您或您的使用作担保。 +二、轻度使用 -三、大量使用情形。 +若您仅参考了本存储库中极小部分的内容，或您的内容与 PCL 的实质功能不存在任何重叠，则为轻度使用。 +其常见情形例如： +· 使用或参考存储库中极小部分的内容，来开发启动器或其他软件。 +· 虽参考了较大量的内容，但制作的软件与 PCL 的实质功能不存在任何重叠。 -　　如果您基于该存储库创作衍生作品，或合理使用了本存储库中的较大量内容，您必须： -　　1、给出适当的署名，且提供指向本存储库的链接。GitHub 上的 Fork 可视为满足此条。 -　　2、不得以任何方式暗示开发者为您或您的使用作担保。 -　　3、给出适当的说明，以明确表示该衍生作品是非官方内容。 -　　4、使用本指南文件作为协议，不得附加额外条款。 -　　5、该衍生作品的名称必须以 “PCL” 或 “Plain Craft Launcher” 开头，并在其后添加后缀。例如 “PCL 整合包优化版”、“PCL PR Collection”。 -　　6、该衍生作品不得包含 PCL 的赞助解锁功能，或与其相近的功能或内容。例如将配色修改为蓝色色系以外的颜色。 -　　7、以善意目的进行合理使用，不要用 PCL 来干坏事、恰烂钱、整烂活。开发者可能会将撤销所有授权作为最终手段。 +若属于轻度使用，您需要： +1、以适当的形式给出署名。 +2、不得将您的内容与 PCL 混淆，或暗示您的内容与 PCL 有关。 + 　例如：您的内容不得使用 Planting Craft Launcher、PCL 手机版 等会造成混淆或暗示这与 PCL 有关的名称。 + + + +三、重度使用 + +若不满足轻度使用的情形，即为重度使用。 +其常见情形例如： +· 基于本存储库进行修改。 +· 参考存储库中较大量的内容，以制作或重新实现 PCL 的部分实质功能（例如启动或下载 Java 版 Minecraft，下载或管理 Mod 等）。 + +若属于重度使用，您需要： +1、明确表示您的内容是第三方基于 PCL 独立进行二次开发的产物。 +2、您的内容的名称必须以 Plain Craft Launcher (PCL) 开头，并在其后添加足以表现其是第三方修改版的后缀。 + 　允许的示例：PCL 某服务器魔改版、PCL PR Collection、PCL (XX Bug Fix)、PCL XXX修改版。 + 　禁止的示例：PCL 某服务器特供版（暗示由官方提供）、PCL 3、PCL 手机版、PCL++、PCL Pro（这像是官方的后续作品）。 +3、在关于页面的首位给出龙腾猫跃的署名及对应的赞助链接，公开源代码，且继续使用本文件作为指南（可参考 CC BY-SC 协议）。 +4、若有 Minecraft 启动功能，则应实现与 McLaunchPrecheck 函数一致的 Minecraft 正版购买弹窗与赞助弹窗。 +5、若是在 Windows 操作系统上运行的软件，则不应有与 PCL 的赞助解锁功能类似的功能或表现。 + 　例如：界面的主要色相必须为蓝色（即使没有修改功能，改为其他色相也和需要赞助解锁的主题功能类似）。 ———————————— @@ -29,5 +43,7 @@ 因为没有法律专业人士检查，所以这不敢作为正式的法律协议，如果有专业人士愿意帮忙改一改我也很乐意…… 这些规则主要是为了阻止恶意的使用和 “山寨版” 的出现，常规、善意的使用都没啥问题的，放心吧！ -如果你只是想参考一下，或者用了一小部分代码，署个名就行啦。 -如果你整了个魔改版，或者用了一大堆代码，请仔细参考上面的第三条。 +如果你只是参考了一小段代码，署个名就行啦，不用担心。 +如果对具体细节有疑问，欢迎在 https://github.com/Hex-Dragon/PCL2/discussions/new?category=%E6%8F%90%E9%97%AE 发帖询问！ + +多谢大家啦！ From ec06c310db3db2af09fb943db1115cbbd48bf038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=85=BE=E7=8C=AB=E8=B7=83?= <1043137532@qq.com> Date: Tue, 22 Apr 2025 05:38:23 +0800 Subject: [PATCH 27/30] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=203.5=20=E7=9A=84?= =?UTF-8?q?=E6=AD=A7=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENCE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENCE b/LICENCE index 00957edec..a5ea555a4 100644 --- a/LICENCE +++ b/LICENCE @@ -33,7 +33,7 @@ 　禁止的示例：PCL 某服务器特供版（暗示由官方提供）、PCL 3、PCL 手机版、PCL++、PCL Pro（这像是官方的后续作品）。 3、在关于页面的首位给出龙腾猫跃的署名及对应的赞助链接，公开源代码，且继续使用本文件作为指南（可参考 CC BY-SC 协议）。 4、若有 Minecraft 启动功能，则应实现与 McLaunchPrecheck 函数一致的 Minecraft 正版购买弹窗与赞助弹窗。 -5、若是在 Windows 操作系统上运行的软件，则不应有与 PCL 的赞助解锁功能类似的功能或表现。 +5、软件在 Windows 系统上运行时，不应有与 PCL 的赞助解锁功能类似的功能或表现。 　例如：界面的主要色相必须为蓝色（即使没有修改功能，改为其他色相也和需要赞助解锁的主题功能类似）。 ———————————— From acde605ce5e0b845ac0b9f2e37a372fec6d894f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=85=BE=E7=8C=AB=E8=B7=83?= <1043137532@qq.com> Date: Tue, 22 Apr 2025 05:43:25 +0800 Subject: [PATCH 28/30] Update LICENCE --- LICENCE | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENCE b/LICENCE index a5ea555a4..f9e821b6b 100644 --- a/LICENCE +++ b/LICENCE @@ -7,7 +7,7 @@ 二、轻度使用 -若您仅参考了本存储库中极小部分的内容，或您的内容与 PCL 的实质功能不存在任何重叠，则为轻度使用。 +若您仅参考了本存储库中极小部分的内容，或您在制作与 PCL 的实质功能不存在任何重叠的软件，则为轻度使用。 其常见情形例如： · 使用或参考存储库中极小部分的内容，来开发启动器或其他软件。 · 虽参考了较大量的内容，但制作的软件与 PCL 的实质功能不存在任何重叠。 @@ -21,18 +21,18 @@ 三、重度使用 -若不满足轻度使用的情形，即为重度使用。 +若不符合轻度使用的情形，即为重度使用。 其常见情形例如： · 基于本存储库进行修改。 · 参考存储库中较大量的内容，以制作或重新实现 PCL 的部分实质功能（例如启动或下载 Java 版 Minecraft，下载或管理 Mod 等）。 若属于重度使用，您需要： -1、明确表示您的内容是第三方基于 PCL 独立进行二次开发的产物。 -2、您的内容的名称必须以 Plain Craft Launcher (PCL) 开头，并在其后添加足以表现其是第三方修改版的后缀。 +1、明确表示您的内容是第三方基于 PCL 独立进行二次创作的产物。 +2、您的内容的名称必须以 Plain Craft Launcher (PCL) 开头，并在其后添加足以表现其由第三方修改的后缀。 　允许的示例：PCL 某服务器魔改版、PCL PR Collection、PCL (XX Bug Fix)、PCL XXX修改版。 　禁止的示例：PCL 某服务器特供版（暗示由官方提供）、PCL 3、PCL 手机版、PCL++、PCL Pro（这像是官方的后续作品）。 3、在关于页面的首位给出龙腾猫跃的署名及对应的赞助链接，公开源代码，且继续使用本文件作为指南（可参考 CC BY-SC 协议）。 -4、若有 Minecraft 启动功能，则应实现与 McLaunchPrecheck 函数一致的 Minecraft 正版购买弹窗与赞助弹窗。 +4、软件若有 Minecraft 启动功能，则应实现与 McLaunchPrecheck 函数一致的 Minecraft 正版购买弹窗与赞助弹窗。 5、软件在 Windows 系统上运行时，不应有与 PCL 的赞助解锁功能类似的功能或表现。 　例如：界面的主要色相必须为蓝色（即使没有修改功能，改为其他色相也和需要赞助解锁的主题功能类似）。 From c8f9066ef2d032d61ec063571590164807456ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Fri, 25 Apr 2025 21:10:52 +0800 Subject: [PATCH 29/30] =?UTF-8?q?style(PageVersionOverall):=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/PageVersion/PageVersionOverall.xaml.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb index b18c7f392..2f03cf49a 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb @@ -108,7 +108,6 @@ '确认输入的新名称 Dim OldName As String = PageVersionLeft.Version.Name Dim OldPath As String = PageVersionLeft.Version.Path -ReType: '修改此部分的同时修改快速安装的版本名检测* Dim NewName As String = MyMsgBoxInput("重命名版本", "", OldName, New ObjectModel.Collection(Of Validate) From {New ValidateFolderName(PathMcFolder & "versions", IgnoreCase:=False)}) If String.IsNullOrWhiteSpace(NewName) Then Exit Sub From d33cbdc3e0fc47263abcb1b3fb22f431ffee3f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=84=E5=A5=9A=E6=A2=A6=E7=81=B5?= Date: Fri, 25 Apr 2025 21:21:24 +0800 Subject: [PATCH 30/30] =?UTF-8?q?chore:=E5=85=88=E4=B8=A2=E5=9B=9E?= =?UTF-8?q?=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb b/Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb index d2fceee74..09ad04358 100644 --- a/Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb +++ b/Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb @@ -72,6 +72,7 @@ Public Class MyMsgInput End Sub Public Sub Btn1_Click() Handles Btn1.Click + TextArea.Validate() If MyConverter.IsExited OrElse Not TextArea.IsValidated Then Exit Sub MyConverter.IsExited = True MyConverter.Result = TextArea.Text