2.5.1

2023-03-08 23:34:10 +08:00
parent 36c10ade8c
commit d886acdeac
50 changed files with 781 additions and 659 deletions
@@ -17,7 +17,7 @@ Public Class FormLoginOAuth
            IsLoginSuccessed = True
            RaiseEvent OnLoginSuccess(Code)
        ElseIf Url.Contains("github.") Then
-            Hint("PCL2 不支持使用 GitHub 登录微软账号！", HintType.Critical)
+            Hint("PCL 不支持使用 GitHub 登录微软账号！", HintType.Critical)
            Close()
        End If
    End Sub
@@ -480,7 +480,7 @@ UseDefault:
                End Try
            Case 4 '自定义
                If Not File.Exists(PathAppdata & "CustomSkin.png") Then
-                    Hint("未找到离线皮肤自定义文件，可能它已被删除。PCL2 将使用默认的 Steve 皮肤！")
+                    Hint("未找到离线皮肤自定义文件，可能它已被删除。PCL 将使用默认的 Steve 皮肤！")
                    Setup.Set("LaunchSkinType", 1)
                    GoTo UseDefault
                End If
@@ -602,7 +602,7 @@ Finish:
    End Sub
    '启动按钮
    Public Sub LaunchButtonClick() Handles BtnLaunch.Click
-        If Not BtnLaunch.IsEnabled Then Exit Sub
+        If McLaunchLoader.State = LoadState.Loading OrElse Not BtnLaunch.IsEnabled Then Exit Sub
        '愚人节处理
        If IsAprilEnabled AndAlso Not IsAprilGiveup Then
            ThemeUnlock(12, False, "隐藏主题 滑稽彩 已解锁！")
@@ -58,7 +58,7 @@
                                           LatestFileLink = Link
                                           LatestFileContent = FileContent
                                       Catch ex As Exception
-                                           Log(ex, "获取 PCL2 主页自定义信息失败", LogLevel.Msgbox)
+                                           Log(ex, "获取 PCL 主页自定义信息失败", LogLevel.Msgbox)
                                           LatestFileLink = ""
                                       End Try
                               End Select
@@ -85,7 +85,7 @@
                                       End Sub)
                           End Sub, "主页自定义刷新")
        Catch ex As Exception
-            Log(ex, "加载 PCL2 主页自定义信息失败", LogLevel.Msgbox)
+            Log(ex, "加载 PCL 主页自定义信息失败", LogLevel.Msgbox)
            IsRefreshing = False
        End Try
    End Sub
@@ -4,7 +4,10 @@
      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
      xmlns:local="clr-namespace:PCL"
-      mc:Ignorable="d" d:DesignWidth="297.6" Margin="0,0,0,5">
-    <local:MyComboBox Margin="0,84,0,0" IsEditable="True" x:Name="ComboName" Height="28" IsTextSearchEnabled="False" HintText="游戏用户名" />
-    <local:MySkin HorizontalAlignment="Center" VerticalAlignment="Top" x:Name="Skin" HasCape="False" />
+      mc:Ignorable="d" d:DesignWidth="297.6">
+    <StackPanel Margin="0,0,0,5">
+        <local:MyHint x:Name="HintChinese" Text="玩家名如果包含英文、数字、下划线以外的内容，可能会无法进入 Minecraft 1.18 以后的世界！" Margin="0,0,0,15" Visibility="Collapsed" />
+        <local:MySkin HorizontalAlignment="Center" x:Name="Skin" HasCape="False" Margin="0,0,0,15" />
+        <local:MyComboBox IsEditable="True" x:Name="ComboName" Height="28" IsTextSearchEnabled="False" HintText="游戏用户名" />
+    </StackPanel>
 </Grid>
@@ -1,4 +1,6 @@
-Public Class PageLoginLegacy
+Imports System.Windows.Forms
+
+Public Class PageLoginLegacy

    Public Sub New()
        InitializeComponent()
@@ -49,9 +51,17 @@
    End Function

    Private Sub ComboLegacy_TextChanged(sender As Object, e As TextChangedEventArgs) Handles ComboName.TextChanged
+        If ComboName.Text.EndsWith(" ") Then
+            ComboName.Text = ComboName.Text.Trim()
+            SendKeys.SendWait("{END}")
+        ElseIf ComboName.Text.StartsWith(" ") Then
+            ComboName.Text = ComboName.Text.Trim()
+            SendKeys.SendWait("{HOME}")
+        End If
        If Setup.Get("LaunchSkinType") = 0 Then
            PageLaunchLeft.SkinLegacy.Start(IsForceRestart:=True)
        End If
+        HintChinese.Visibility = If(RegexCheck(ComboName.Text, "^[0-9A-Za-z_]*$"), Visibility.Collapsed, Visibility.Visible)
    End Sub
    Private Sub Skin_Click() Handles Skin.Click
        If (Setup.Get("UiHiddenPageSetup") OrElse Setup.Get("UiHiddenSetupLaunch")) AndAlso Not PageSetupUI.HiddenForceShow Then
@@ -65,7 +65,7 @@
            Hint("登录失败，无法更改皮肤！", HintType.Critical)
            Exit Sub
        End If
-        Dim SkinInfo As McSkinInfo = McSkinSelect(False)
+        Dim SkinInfo As McSkinInfo = McSkinSelect()
        If Not SkinInfo.IsVaild Then Exit Sub
        Hint("正在更改皮肤……")
        RunInNewThread(Async Sub()
@@ -69,7 +69,7 @@
            Hint("登录失败，无法更改皮肤！", HintType.Critical)
            Exit Sub
        End If
-        Dim SkinInfo As McSkinInfo = McSkinSelect(False)
+        Dim SkinInfo As McSkinInfo = McSkinSelect()
        If Not SkinInfo.IsVaild Then Exit Sub
        Hint("正在更改皮肤……")
        IsChanging = True