2.9.1

Plain Craft Launcher 2/Modules/Base/ModValidate.vb

@@ -262,7 +262,6 @@ Public Class ValidateFileName
     Public Property IgnoreCase As Boolean = True
     Public Property ParentFolder As String = Nothing
     Public Property RequireParentFolderExists = True
-    Public Property AllowNull As Boolean = False
     Public Sub New()
     End Sub
     Public Sub New(Name As String, Optional UseMinecraftCharCheck As Boolean = True, Optional IgnoreCase As Boolean = True)
@@ -272,16 +271,14 @@ Public Class ValidateFileName
     End Sub
     Public Overrides Function Validate(Str As String) As String
         Try
-            If Not AllowNull Then
-                '检查是否为空
-                Dim NullCheck As String = New ValidateNullOrWhiteSpace().Validate(Str)
-                If Not NullCheck = "" Then Return NullCheck
-            End If
+            '检查是否为空
+            Dim LengthCheck As String = New ValidateNullOrWhiteSpace().Validate(Str)
+            If Not LengthCheck = "" Then Return LengthCheck
             '检查空格
             If Str.StartsWithF(" ") Then Return "文件名不能以空格开头！"
             If Str.EndsWithF(" ") Then Return "文件名不能以空格结尾！"
             '检查长度
-            Dim LengthCheck = New ValidateLength(If(AllowNull, 0, 1), 253).Validate(Str & If(ParentFolder, ""))
+            LengthCheck = New ValidateLength(1, 253).Validate(Str & If(ParentFolder, ""))
             If Not LengthCheck = "" Then Return LengthCheck
             '检查尾部小数点
             If Str.EndsWithF(".") Then Return "文件名不能以小数点结尾！"
@@ -318,7 +315,6 @@ End Class
 Public Class ValidateFolderPath
     Inherits Validate
     Public Property UseMinecraftCharCheck As Boolean = True
-    Public Property AllowNull As Boolean = False
     Public Sub New()
     End Sub
     Public Sub New(UseMinecraftCharCheck As Boolean)
@@ -330,9 +326,9 @@ Public Class ValidateFolderPath
         If Not Str.TrimEnd("\").EndsWithF(":") Then Str = Str.TrimEnd("\")
         '检查是否为空
         Dim LengthCheck As String = New ValidateNullOrWhiteSpace().Validate(Str)
-        If Not AllowNull AndAlso Not LengthCheck = "" Then Return LengthCheck
+        If Not LengthCheck = "" Then Return LengthCheck
         '检查长度
-        LengthCheck = New ValidateLength(If(AllowNull, 0, 1), 254).Validate(Str)
+        LengthCheck = New ValidateLength(1, 254).Validate(Str)
         If Not LengthCheck = "" Then Return LengthCheck
         '检查开头
         If Str.StartsWithF("\\Mac\") Then GoTo Fin