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 1/6] =?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 0394060..0dd9352 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 2/6] =?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 0dd9352..0394060 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 7a975a4..08ce7c4 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 3/6] =?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 08ce7c4..e2b8f3c 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 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 4/6] =?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 56ae475..e0bf5b8 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 e2b8f3c..ed925e5 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 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 5/6] =?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 b18c7f3..2f03cf4 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 6/6] =?UTF-8?q?chore:=E5=85=88=E4=B8=A2=E5=9B=9E=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 d2fceee..09ad043 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