From 794c3003f35289fe28c305cf6fd5c860a00bd34c 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: Thu, 22 Jun 2023 17:04:23 +0800
Subject: [PATCH] 2.6.3

---
 Plain Craft Launcher 2/Application.xaml       |   4 +-
 Plain Craft Launcher 2/Controls/MySlider.xaml |   2 +-
 Plain Craft Launcher 2/FormMain.xaml.vb       |  24 +++++++-
 .../Modules/Base/ModBase.vb                   |   6 +-
 .../Modules/Minecraft/ModComp.vb              |   6 +-
 .../Modules/Minecraft/ModCrash.vb             |  50 ++++++++++-------
 .../Modules/Minecraft/ModJava.vb              |  52 ++++++++++--------
 .../Modules/Minecraft/ModLaunch.vb            |  13 +++--
 .../Modules/Minecraft/ModMinecraft.vb         |   5 +-
 .../Modules/Minecraft/ModModpack.vb           |   7 +++
 .../My Project/AssemblyInfo.vb                |   4 +-
 .../Pages/PageDownload/ModDownloadLib.vb      |   2 +-
 .../PageDownload/PageDownloadInstall.xaml.vb  |  13 +++++
 .../Pages/PageDownload/PageDownloadMod.xaml   |   1 +
 .../Pages/PageDownload/PageDownloadPack.xaml  |   3 +-
 .../Pages/PageLaunch/PageLaunchLeft.xaml.vb   |   8 ++-
 .../Pages/PageLaunch/PageLoginLegacy.xaml.vb  |  21 +++----
 .../Pages/PageSelectLeft.xaml.vb              |   1 +
 .../Pages/PageSelectRight.xaml.vb             |   4 +-
 .../Pages/PageSetup/PageSetupLaunch.xaml      |   2 +-
 .../Pages/PageSetup/PageSetupLaunch.xaml.vb   |   2 +-
 .../Pages/PageVersion/PageVersionMod.xaml.vb  |   2 +
 .../Pages/PageVersion/PageVersionOverall.xaml |   3 +-
 .../PageVersion/PageVersionOverall.xaml.vb    |   4 +-
 .../Pages/PageVersion/PageVersionSetup.xaml   |   8 +--
 .../PageVersion/PageVersionSetup.xaml.vb      |   2 +-
 .../Resources/java-wrapper.jar                | Bin 17727 -> 17734 bytes
 27 files changed, 160 insertions(+), 89 deletions(-)

diff --git a/Plain Craft Launcher 2/Application.xaml b/Plain Craft Launcher 2/Application.xaml
index 9b5f401..8fc582a 100644
--- a/Plain Craft Launcher 2/Application.xaml	
+++ b/Plain Craft Launcher 2/Application.xaml	
@@ -466,9 +466,9 @@
             </Style>
             <Style TargetType="ComboBoxItem" x:Key="MyComboBoxItem">
                 <Setter Property="OverridesDefaultStyle" Value="True" />
-                <Setter Property="ToolTipService.Placement" Value="Right" />
+                <Setter Property="ToolTipService.Placement" Value="Relative" />
                 <Setter Property="ToolTipService.VerticalOffset" Value="-2" />
-                <Setter Property="ToolTipService.HorizontalOffset" Value="-250" />
+                <Setter Property="ToolTipService.HorizontalOffset" Value="200" />
                 <Setter Property="ToolTipService.InitialShowDelay" Value="150" />
                 <Setter Property="ToolTipService.BetweenShowDelay" Value="150" />
                 <Setter Property="FocusVisualStyle" Value="{x:Null}" />
diff --git a/Plain Craft Launcher 2/Controls/MySlider.xaml b/Plain Craft Launcher 2/Controls/MySlider.xaml
index 0eeb3f6..dc5882e 100644
--- a/Plain Craft Launcher 2/Controls/MySlider.xaml	
+++ b/Plain Craft Launcher 2/Controls/MySlider.xaml	
@@ -9,7 +9,7 @@
              MinHeight="16" UseLayoutRounding="False" SnapsToDevicePixels="False" BorderBrush="{DynamicResource ColorBrushBg0}" Name="PanBack" Background="{StaticResource ColorBrushSemiTransparent}" Focusable="True">
     <Grid x:Name="PanMain" MinHeight="16" MaxHeight="16" IsHitTestVisible="False">
         <Line Height="4" Name="LineBack" Stroke="{DynamicResource ColorBrushBg0}" Opacity="0.3" StrokeThickness="1" X2="10000" Y1="2" Y2="2" HorizontalAlignment="Right" Width="0" SnapsToDevicePixels="True" Margin="0,0,1,0" />
-        <Line Height="4" Name="LineFore" Stroke="{Binding ElementName=PanBack, Path=BorderBrush}" StrokeThickness="1" X2="10000" Y1="2" Y2="2" Width="0" HorizontalAlignment="Left" SnapsToDevicePixels="True" Margin="1,0,0,0" />
+        <Line Height="4" Name="LineFore" Stroke="{Binding ElementName=PanBack, Path=BorderBrush}" StrokeThickness="2" X2="10000" Y1="2" Y2="2" Width="0" HorizontalAlignment="Left" SnapsToDevicePixels="True" Margin="1,0,0,0" />
         <Ellipse HorizontalAlignment="Left" Width="10" Height="10" 
                  Stroke="{Binding BorderBrush, ElementName=PanBack}" StrokeThickness="1.2" 
                  Fill="{DynamicResource ColorBrushBg0}" Name="ShapeDot" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5">
diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb
index 7f12a64..dd8b31d 100644
--- a/Plain Craft Launcher 2/FormMain.xaml.vb	
+++ b/Plain Craft Launcher 2/FormMain.xaml.vb	
@@ -10,6 +10,13 @@ Public Class FormMain
         Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
         '统计更新日志条目
 #If BETA Then
+        If LastVersion < 296 Then 'Release 2.6.3
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "新增内存优化功能，可以将所有程序的物理内存占用降低约 1/3"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "在选择 OptiFine 与 Fabric 后会自动选择 OptiFabric"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化崩溃分析，添加多种崩溃情况的判断"))
+            FeatureCount += 21
+            BugCount += 30
+        End If
         If LastVersion < 293 Then 'Release 2.6.1
             BugCount += 1
         End If
@@ -109,6 +116,11 @@ Public Class FormMain
         '3：BUG+ IMP* FEAT-
         '2：BUG* IMP-
         '1：BUG-
+        If LastVersion < 295 Then 'Snapshot 2.6.3
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化崩溃分析，添加多种崩溃情况的判断"))
+            FeatureCount += 12
+            BugCount += 14
+        End If
         If LastVersion < 294 Then 'Snapshot 2.6.2
             FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "新增内存优化功能，可以将所有程序的物理内存占用降低约 1/3"))
             FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "在选择 OptiFine 与 Fabric 后会自动选择 OptiFabric"))
@@ -366,8 +378,14 @@ Public Class FormMain
         End If
         '加载窗口
         ThemeRefreshMain()
-        Height = ReadReg("WindowHeight", MinHeight + 50)
-        Width = ReadReg("WindowWidth", MinWidth + 50)
+        Try
+            Height = ReadReg("WindowHeight", MinHeight + 50)
+            Width = ReadReg("WindowWidth", MinWidth + 50)
+        Catch ex As Exception '修复 #2019
+            Log(ex, "读取窗口默认大小失败", LogLevel.Hint)
+            Height = MinHeight + 50
+            Width = MinWidth + 50
+        End Try
         Topmost = False
         If FrmStart IsNot Nothing Then FrmStart.Close(New TimeSpan(0, 0, 0, 0, 400 / AniSpeed))
         '更改窗口
@@ -585,6 +603,7 @@ Public Class FormMain
             Process.GetCurrentProcess.Kill()
         Else
             Environment.Exit(ReturnCode)
+            Process.GetCurrentProcess.Kill()
         End If
     End Sub
     Private Sub BtnTitleClose_Click(sender As Object, e As RoutedEventArgs) Handles BtnTitleClose.Click
@@ -612,6 +631,7 @@ Public Class FormMain
         PanForm.Height = BorderForm.ActualHeight + 0.001
         PanMain.Width = PanForm.Width
         PanMain.Height = Math.Max(0, PanForm.Height - PanTitle.ActualHeight)
+        If WindowState = WindowState.Maximized Then WindowState = WindowState.Normal '修复 #1938
     End Sub
 
     '最小化
diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb
index 9e94274..4b3d37e 100644
--- a/Plain Craft Launcher 2/Modules/Base/ModBase.vb	
+++ b/Plain Craft Launcher 2/Modules/Base/ModBase.vb	
@@ -11,12 +11,12 @@ Public Module ModBase
 #Region "声明"
 
     '下列版本信息由更新器自动修改
-    Public Const VersionBaseName As String = "2.6.2" '不含分支前缀的显示用版本名
-    Public Const VersionStandardCode As String = "2.6.2." & VersionBranchCode '标准格式的四段式版本号
+    Public Const VersionBaseName As String = "2.6.3" '不含分支前缀的显示用版本名
+    Public Const VersionStandardCode As String = "2.6.3." & VersionBranchCode '标准格式的四段式版本号
 #If BETA Then
     Public Const VersionCode As Integer = 293 'Release
 #Else
-    Public Const VersionCode As Integer = 294 'Snapshot
+    Public Const VersionCode As Integer = 295 'Snapshot
 #End If
     '自动生成的版本信息
     Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb
index 5b92875..400087c 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb	
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb	
@@ -468,8 +468,10 @@ NoExName:
                     '去除 “Forge/Fabric” 这一无意义提示
                     If Ex.Length < 19 AndAlso Ex.ToLower.Contains("fabric") AndAlso Ex.ToLower.Contains("forge") Then Continue For
                     '将 “Forge” 等提示改为 “Forge 版”
-                    If (Ex.ToLower.Contains("forge") OrElse Ex.ToLower.Contains("fabric") OrElse Ex.ToLower.Contains("quilt")) AndAlso
-                       Not Ex.Contains("版") AndAlso Ex.Length < 19 Then Ex = Ex.Replace("Edition", "").Trim.Capitalize & " 版"
+                    If (Ex.ToLower.Contains("forge") OrElse Ex.ToLower.Contains("fabric") OrElse Ex.ToLower.Contains("quilt")) AndAlso Not Ex.Contains("版") AndAlso
+                        Ex.ToLower.Replace("forge", "").Replace("fabric", "").Replace("quilt", "").Length <= 3 Then
+                        Ex = Ex.Replace("Edition", "").Trim.Capitalize & " 版"
+                    End If
                     ExName &= "  |  " & Ex.Trim
                 Next
                 If ExName = "" Then GoTo NoExName
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb
index 331b112..b44de25 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb	
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb	
@@ -165,37 +165,37 @@
         DirectFile = Nothing
         Dim TotalFiles As New List(Of KeyValuePair(Of AnalyzeFileType, KeyValuePair(Of String, String())))
         For Each LogFile In AnalyzeRawFiles
-            Dim FileName As String = GetFileNameFromPath(LogFile.Key)
+            Dim MatchName As String = GetFileNameFromPath(LogFile.Key).ToLower
             Dim TargetType As AnalyzeFileType
-            If FileName.StartsWith("hs_err") Then
+            If MatchName.StartsWith("hs_err") Then
                 TargetType = AnalyzeFileType.HsErr
                 DirectFile = LogFile
-            ElseIf FileName.StartsWith("crash-") Then
+            ElseIf MatchName.StartsWith("crash-") Then
                 TargetType = AnalyzeFileType.CrashReport
                 DirectFile = LogFile
-            ElseIf FileName = "latest.log" OrElse FileName = "latest log.txt" OrElse
-                   FileName = "debug.log" OrElse FileName = "debug log.txt" OrElse
-                   FileName = "游戏崩溃前的输出.txt" OrElse FileName = "rawoutput.log" Then
+            ElseIf MatchName = "latest.log" OrElse MatchName = "latest log.txt" OrElse
+                   MatchName = "debug.log" OrElse MatchName = "debug log.txt" OrElse
+                   MatchName = "游戏崩溃前的输出.txt" OrElse MatchName = "rawoutput.log" Then
                 TargetType = AnalyzeFileType.MinecraftLog
                 If DirectFile Is Nothing Then DirectFile = LogFile
-            ElseIf FileName = "启动器日志.txt" OrElse FileName = "PCL2 启动器日志.txt" OrElse FileName = "PCL 启动器日志.txt" OrElse FileName = "log1.txt" Then
+            ElseIf MatchName = "启动器日志.txt" OrElse MatchName = "PCL2 启动器日志.txt" OrElse MatchName = "PCL 启动器日志.txt" OrElse MatchName = "log1.txt" Then
                 If LogFile.Value.Any(Function(s) s.Contains("以下为游戏输出的最后一段内容")) Then
                     TargetType = AnalyzeFileType.MinecraftLog
                     If DirectFile Is Nothing Then DirectFile = LogFile
                 Else
                     TargetType = AnalyzeFileType.ExtraLog
                 End If
-            ElseIf FileName.EndsWith(".log") OrElse FileName.EndsWith(".txt") Then
+            ElseIf MatchName.EndsWith(".log") OrElse MatchName.EndsWith(".txt") Then
                 TargetType = AnalyzeFileType.ExtraLog
             Else
-                Log("[Crash] " & FileName & " 分类为 Ignore")
+                Log("[Crash] " & MatchName & " 分类为 Ignore")
                 Continue For
             End If
             If LogFile.Value.Count = 0 Then
-                Log("[Crash] " & FileName & " 由于内容为空跳过")
+                Log("[Crash] " & MatchName & " 由于内容为空跳过")
             Else
                 TotalFiles.Add(New KeyValuePair(Of AnalyzeFileType, KeyValuePair(Of String, String()))(TargetType, LogFile))
-                Log("[Crash] " & FileName & " 分类为 " & GetStringFromEnum(TargetType))
+                Log("[Crash] " & MatchName & " 分类为 " & GetStringFromEnum(TargetType))
             End If
         Next
 
@@ -364,6 +364,7 @@
         NightConfig的Bug
         ShadersMod与Optifine同时安装
         Forge安装不完整
+        Mod需要Java11
     End Enum
     ''' <summary>
     ''' 根据 AnalyzeLogs 与可能的版本信息分析崩溃原因。
@@ -469,6 +470,7 @@ Done:
             If LogMc.Contains("java.lang.ClassCastException: class jdk.") Then AppendReason(CrashReason.使用JDK)
             If LogMc.Contains("TRANSFORMER/net.optifine/net.optifine.reflect.Reflector.<clinit>(Reflector.java") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
             If LogMc.Contains("java.lang.NoSuchMethodError: 'void net.minecraft.client.renderer.texture.SpriteContents.<init>(net.minecraft.resources.ResourceLocation, ") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
+            If LogMc.Contains("java.lang.NoSuchMethodError: 'java.lang.String com.mojang.blaze3d.systems.RenderSystem.getBackendDescription") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
             If LogMc.Contains("java.lang.NoSuchMethodError: 'void net.minecraft.client.renderer.block.model.BakedQuad.<init>(int[], int, net.minecraft.core.Direction, net.minecraft.client.renderer.texture.TextureAtlasSprite, boolean, boolean)'") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
             If LogMc.Contains("java.lang.NoSuchMethodError: 'void net.minecraft.server.level.DistanceManager.addRegionTicket(net.minecraft.server.level.TicketType, net.minecraft.world.level.ChunkPos, int, java.lang.Object, boolean)'") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
             If LogMc.Contains("java.lang.NoSuchMethodError: 'void net.minecraft.server.level.DistanceManager.removeRegionTicket(net.minecraft.server.level.TicketType, net.minecraft.world.level.ChunkPos, int, java.lang.Object, boolean)'") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
@@ -492,7 +494,10 @@ Done:
             If LogMc.Contains("com.electronwill.nightconfig.core.io.ParsingException: Not enough data available") Then AppendReason(CrashReason.NightConfig的Bug)
             If LogMc.Contains("Cannot find launch target fmlclient, unable to launch") Then AppendReason(CrashReason.Forge安装不完整)
             If LogMc.Contains("Invalid module name: '' is not a Java identifier") Then AppendReason(CrashReason.Mod名称包含特殊字符)
+            If LogMc.Contains("has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to") Then AppendReason(CrashReason.Mod需要Java11)
+            If LogMc.Contains("java.lang.RuntimeException: java.lang.NoSuchMethodException: no such method: sun.misc.Unsafe.defineAnonymousClass(Class,byte[],Object[])Class/invokeVirtual") Then AppendReason(CrashReason.Mod需要Java11)
             If LogMc.Contains("java.lang.UnsupportedClassVersionError: net/fabricmc/loader/impl/launch/knot/KnotClient : Unsupported major.minor version") Then AppendReason(CrashReason.Java版本不兼容)
+            If LogMc.Contains("Invalid maximum heap size") Then AppendReason(CrashReason.使用32位Java导致JVM无法分配足够多的内存)
             If LogMc.Contains("Could not reserve enough space") Then
                 If LogMc.Contains("for 1048576KB object heap") Then
                     AppendReason(CrashReason.使用32位Java导致JVM无法分配足够多的内存)
@@ -505,16 +510,15 @@ Done:
             If LogMc.Contains("Found a duplicate mod") Then AppendReason(CrashReason.Mod重复安装, RegexSearch(If(RegexSeek(LogMc, "Found a duplicate mod[^\n]+"), ""), "[^\\/]+.jar", RegularExpressions.RegexOptions.IgnoreCase))
             If LogMc.Contains("ModResolutionException: Duplicate") Then AppendReason(CrashReason.Mod重复安装, RegexSearch(If(RegexSeek(LogMc, "ModResolutionException: Duplicate[^\n]+"), ""), "[^\\/]+.jar", RegularExpressions.RegexOptions.IgnoreCase))
             'Mod 导致的崩溃
-            If LogMc.Contains("Mixin prepare failed ") OrElse LogMc.Contains("Mixin apply failed ") OrElse
-                LogMc.Contains("mixin.injection.throwables.") OrElse LogMc.Contains(".mixins.json] FAILED during )") Then
+            If LogMc.Contains("Mixin prepare failed ") OrElse LogMc.Contains("Mixin apply failed ") OrElse LogMc.Contains("MixinApplyError") OrElse
+            LogMc.Contains("mixin.injection.throwables.") OrElse LogMc.Contains(".mixins.json] FAILED during )") Then
                 Dim ModId As String = RegexSeek(LogMc, "(?<=in )[^./ ]+(?=.mixins.json.+failed injection check)")
                 If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=in mixins.)[^./ ]+(?=.json.+failed injection check)")
                 If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= failed .+ in )[^./ ]+(?=.mixins.json)")
                 If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= failed .+ in mixins.)[^./ ]+(?=.json)")
                 If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= in config \[)[^./ ]+(?=.mixins.json\] FAILED during )")
                 If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= in config \[mixins.)[^./ ]+(?=.json\] FAILED during )")
-                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= in callback )[^./ ]+(?=.mixins.json:)")
-                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=from mod )[^\] ]+(?=\] from phase)")
+                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=from mod )[^./ ]+(?=\] from)")
                 If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=for mod )[^./ ]+(?= failed)")
                 '兜底名称判断
                 If ModId Is Nothing Then ModId = RegexSeek(LogMc, "[^./ \]]+(?=.mixins.json")
@@ -622,11 +626,11 @@ NextStack:
                 Dim Word As String = Splited(i)
                 If Word.Length <= 2 OrElse Word.StartsWith("func_") Then Continue For
                 If {"com", "org", "net", "asm", "fml", "mod", "jar", "sun", "lib", "map", "gui", "dev", "nio", "api", "dsi", "top",
-                    "core", "init", "mods", "main", "file", "game", "load", "read", "done", "util", "tile", "item", "base",
+                    "core", "init", "mods", "main", "file", "game", "load", "read", "done", "util", "tile", "item", "base", "oshi",
                     "forge", "setup", "block", "model", "mixin", "event", "unimi", "netty",
                     "common", "server", "config", "loader", "launch", "entity", "assist", "client", "plugin", "modapi", "mojang", "shader", "events", "github", "recipe",
                     "preinit", "preload", "machine", "reflect", "channel", "general", "handler", "content",
-                    "fastutil", "optifine", "scheduler", "minecraft", "transformers", "universal", "internal", "multipart", "minecraftforge", "override", "blockentity"
+                    "fastutil", "optifine", "scheduler", "minecraft", "transformers", "universal", "internal", "multipart", "minecraftforge", "override", "blockentity", "platform"
                    }.Contains(Word.ToLower) Then Continue For
                 PossibleWords.Add(Word.Trim)
             Next
@@ -818,9 +822,9 @@ NextStack:
                     Results.Add("由于有 Mod 的名称包含特殊字符，导致游戏崩溃。\n请尝试修改 Mod 文件名，让它只包含英文字母、数字、减号（-）、下划线（_）和小数点，然后再启动游戏。")
                 Case CrashReason.使用32位Java导致JVM无法分配足够多的内存
                     If Environment.Is64BitOperatingSystem Then
-                        Results.Add("你似乎正在使用 32 位 Java，这会导致 Minecraft 无法使用 1GB 以上的内存，进而造成崩溃。\n\n请在启动设置的 Java 选择一项中改用 64 位的 Java 再启动游戏，然后再启动游戏。\n如果你没有安装 64 位的 Java，你可以从网络中下载、安装一个。")
+                        Results.Add("你似乎正在使用 32 位 Java，这会导致 Minecraft 无法使用所需的内存，进而造成崩溃。\n\n请在启动设置的 Java 选择一项中改用 64 位的 Java 再启动游戏，然后再启动游戏。\n如果你没有安装 64 位的 Java，你可以从网络中下载、安装一个。")
                     Else
-                        Results.Add("你正在使用 32 位的操作系统，这会导致 Minecraft 无法使用 1GB 以上的内存，进而造成崩溃。\n\n你或许只能重装 64 位的操作系统来解决此问题。\n如果你的电脑内存在 2GB 以内，那或许只能换台电脑了……\h")
+                        Results.Add("你正在使用 32 位的操作系统，这会导致 Minecraft 无法使用所需的内存，进而造成崩溃。\n\n你或许只能重装 64 位的操作系统来解决此问题。\n如果你的电脑内存在 2GB 以内，那或许只能换台电脑了……\h")
                     End If
                 Case CrashReason.崩溃日志堆栈分析发现关键字, CrashReason.MC日志堆栈分析发现关键字
                     If Additional.Count = 1 Then
@@ -886,6 +890,8 @@ NextStack:
                     Results.Add("可能由于使用其他启动器修改了 Forge 版本，当前版本的文件存在异常，导致了游戏崩溃。\n请尝试重新全新安装 Forge，而非使用其他启动器修改 Forge 版本。")
                 Case CrashReason.玩家手动触发调试崩溃
                     Results.Add("* 事实上，你的游戏没有任何问题，这是你自己触发的崩溃。\n* 你难道没有更重要的事要做吗？")
+                Case CrashReason.Mod需要Java11
+                    Results.Add("你所安装的部分 Mod 似乎需要使用 Java 11 启动。\n请在启动设置的 Java 选择一项中改用 Java 11，然后再启动游戏。\n如果你没有安装 Java 11，你可以从网络中下载、安装一个。")
                 Case CrashReason.极短的程序输出
                     Results.Add($"程序返回了以下信息：\n{Additional.First}\n\h")
                 Case CrashReason.OptiFine导致无法加载世界 'https://www.minecraftforum.net/forums/support/java-edition-support/3051132-exception-ticking-world
@@ -947,8 +953,10 @@ NextStack:
                     Replace("\e", If(IsHandAnalyze, "", vbCrLf & "你可以查看错误报告了解错误具体是如何发生的。")).
                     Replace(vbCrLf, vbCr).Replace(vbLf, vbCr).Replace(vbCr, vbCrLf).
                     Trim(vbCrLf.ToCharArray) &
-                If(Results.Any(Function(r) r.EndsWith("\h")),
-                    If(IsHandAnalyze, "", vbCrLf & "如果要寻求帮助，请向他人发送错误报告文件，而不是发送这个窗口的截图。"), "")
+                If(Not Results.Any(Function(r) r.EndsWith("\h")) OrElse IsHandAnalyze, "",
+                    vbCrLf & "如果要寻求帮助，请向他人发送错误报告文件，而不是发送这个窗口的截图。" &
+                    If(If(PageSetupSystem.IsLauncherNewest(), True), "",
+                    vbCrLf & vbCrLf & "此外，你正在使用老版本 PCL，更新到最新版可能会修复这个问题。" & vbCrLf & "你可以点击 设置 → 启动器 → 检查更新 来更新 PCL。"))
     End Function
 
 End Class
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb
index 717958f..7c6acf0 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb	
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb	
@@ -182,7 +182,8 @@
                 Log("[Java] 初始化未找到可用的 Java，将自动触发搜索", LogLevel.Developer)
                 JavaSearchLoader.Start(0)
             Else
-                Log("[Java] 缓存中有 " & JavaList.Count & " 个可用的 Java")
+                Log("[Java] 缓存中有 " & JavaList.Count & " 个可用的 Java：")
+                JavaList.ForEach(Sub(j) Log($"[Java]  - {j}"))
             End If
         Catch ex As Exception
             Log(ex, "初始化 Java 列表失败", LogLevel.Feedback)
@@ -201,7 +202,9 @@
 
             '添加特定的 Java
             Dim JavaPreList As New Dictionary(Of String, Boolean)
-            If PathMcFolder.Split("\").Count > 3 Then JavaSearchFolder(GetPathFromFullPath(PathMcFolder), JavaPreList, False, True) 'Minecraft 文件夹的父文件夹（如果不是根目录的话）
+            If PathMcFolder.Split("\").Count > 3 Then
+                JavaSearchFolder(GetPathFromFullPath(PathMcFolder), JavaPreList, False, True) 'Minecraft 文件夹的父文件夹（如果不是根目录的话）
+            End If
             JavaSearchFolder(PathMcFolder, JavaPreList, False, True) 'Minecraft 文件夹
             If RelatedVersion IsNot Nothing Then JavaSearchFolder(RelatedVersion.Path, JavaPreList, False, True) '所选版本文件夹
             Dim TargetJavaList As New List(Of JavaEntry)
@@ -209,6 +212,15 @@
                 TargetJavaList.Add(New JavaEntry(Entry.Key, Entry.Value))
             Next
 
+            '检查特定的 Java
+            If TargetJavaList.Count > 0 Then
+                TargetJavaList = JavaCheckList(TargetJavaList)
+                Log("[Java] 检查后找到 " & TargetJavaList.Count & " 个特定路径下的 Java：")
+                For Each Java In TargetJavaList
+                    Log($"[Java]  - {Java}")
+                Next
+            End If
+
 #Region "添加用户指定的 Java，储存到 UserJava 中"
 
             Dim UserJava As JavaEntry = Nothing
@@ -217,13 +229,7 @@
             If RelatedVersion IsNot Nothing AndAlso Setup.Get("VersionArgumentJavaSelect", Version:=RelatedVersion).ToString.StartsWith("{") Then
                 Try
                     UserJava = JavaEntry.FromJson(GetJson(Setup.Get("VersionArgumentJavaSelect", Version:=RelatedVersion)))
-                    '确保版本独立设置中指定的 Java 在 Java 列表中（#978）
-                    If Not JavaList.Any(Function(j) j.PathFolder = UserJava.PathFolder) Then
-                        UserJava = Nothing
-                        Setup.Reset("VersionArgumentJavaSelect", Version:=RelatedVersion)
-                        Log("版本独立设置中指定的 Java 不在主 Java 列表中，此设置已重置", LogLevel.Debug)
-                        Exit Try
-                    End If
+                    UserJava.Check()
                 Catch ex As Exception
                     UserJava = Nothing
                     Setup.Reset("VersionArgumentJavaSelect", Version:=RelatedVersion)
@@ -235,10 +241,11 @@
             If UserJava Is Nothing AndAlso Setup.Get("LaunchArgumentJavaSelect") <> "" Then
                 Try
                     UserJava = JavaEntry.FromJson(GetJson(Setup.Get("LaunchArgumentJavaSelect")))
+                    UserJava.Check()
                 Catch ex As Exception
                     UserJava = Nothing
                     Setup.Reset("LaunchArgumentJavaSelect")
-                    Log(ex, "设置中指定的 Java 已无法使用，此设置已重置", LogLevel.Hint)
+                    Log(ex, "全局设置中指定的 Java 已无法使用，此设置已重置", LogLevel.Hint)
                 End Try
             End If
 
@@ -250,12 +257,6 @@
 
 #End Region
 
-            '检查特定的 Java
-            If TargetJavaList.Count > 0 Then
-                TargetJavaList = JavaCheckList(TargetJavaList)
-                Log("[Java] 检查后找到 " & TargetJavaList.Count & " 个特定的 Java")
-            End If
-
 RetryGet:
             '等待进行中的搜索结束
             If JavaSearchLoader.State <> LoadState.Finished AndAlso JavaSearchLoader.State <> LoadState.Waiting Then JavaSearchLoader.WaitForExit()
@@ -298,8 +299,9 @@ RetryGet:
 
             '指定的 Java 不可用，弹窗要求选择
             Log("[Java] 发现用户指定的不兼容 Java：" & UserJava.ToString)
+            Log($"[Java] 目前实际可用的 Java 列表：")
             For Each Java In AllowedJavaList
-                Log($"[Java] 实际可用的 Java：{Java.ToString}")
+                Log($"[Java]  - {Java}")
             Next
             Dim Requirement As String = ""
             Dim ShowRevision As Boolean = False
@@ -344,10 +346,12 @@ ExitUserJavaCheck:
 
             '优先使用特定目录下的 Java
             For Each Java In AllowedJavaList
+                '如果在官启文件夹启动，会将官启自带 Java 错误视作 MC 文件夹指定 Java，导致了 #2054 的第二例
+                If Java.PathFolder.Contains(".minecraft\cache\java") Then Continue For
                 If TargetJavaList.Contains(Java) Then
                     '直接使用指定的 Java
                     AllowedJavaList = New List(Of JavaEntry) From {Java}
-                    Log("[Java] 优先使用特定的 Java：" & Java.ToString)
+                    Log("[Java] 优先使用特定路径下的 Java：" & Java.ToString)
                     GoTo UserPass
                 End If
             Next
@@ -355,6 +359,10 @@ UserPass:
 
             '对适合的 Java 进行排序
             AllowedJavaList = Sort(AllowedJavaList, AddressOf JavaSorter)
+            Log($"[Java] 排序后的 Java 优先顺序：")
+            For Each Java In AllowedJavaList
+                Log($"[Java]  - {Java}")
+            Next
 
             '检查选定的 Java，若测试失败则尝试进行搜索
             Dim SelectedJava = AllowedJavaList.First
@@ -364,14 +372,14 @@ UserPass:
                 Throw
             Catch ex As Exception
                 If ex.InnerException IsNot Nothing AndAlso TypeOf (ex.InnerException) Is ThreadInterruptedException Then Throw ex.InnerException
-                Log(ex, "找到的 Java 已无法使用，尝试进行搜索")
+                Log(ex, "最终选定的 Java 已无法使用，尝试进行搜索")
                 AllowedJavaList = New List(Of JavaEntry)
                 JavaSearchLoader.Start(IsForceRestart:=True)
                 GoTo RetryGet
             End Try
 
             '返回
-            Log("[Java] 选定的 Java：" & SelectedJava.ToString)
+            Log("[Java] 最终选定的 Java：" & AllowedJavaList.First.ToString)
             Return SelectedJava
 
         Catch ex As ThreadInterruptedException
@@ -442,7 +450,7 @@ NoUserJava:
         '4. Java 大版本
         If Left.VersionCode <> Right.VersionCode Then
             '                             Java  7   8   9  10  11  12 13 14 15  16  17  18  19  20...
-            Dim Weight = {0, 1, 2, 3, 4, 5, 6, 14, 29, 10, 11, 12, 13, 9, 8, 7, 15, 31, 30, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28}
+            Dim Weight = {0, 1, 2, 3, 4, 5, 6, 14, 29, 10, 12, 15, 13, 9, 8, 7, 11, 31, 30, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28}
             Return Weight.ElementAtOrDefault(Left.VersionCode) >= Weight.ElementAtOrDefault(Right.VersionCode)
         End If
         '5. 最次级版本号更接近 51
@@ -585,7 +593,7 @@ NoUserJava:
             Dim CheckThread As New Thread(Sub()
                                               Try
                                                   Entry.Check()
-                                                  Log("[Java] " & Entry.ToString)
+                                                  If ModeDebug Then Log("[Java]  - " & Entry.ToString)
                                                   SyncLock ListLock
                                                       JavaCheckList.Add(Entry)
                                                   End SyncLock
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb
index cdd0a90..569cc1b 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb	
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb	
@@ -1115,11 +1115,14 @@ SystemBrowser:
         'OptiFine 检测
         If McVersionCurrent.Version.HasOptiFine Then
             If McVersionCurrent.Version.McCodeMain <= 7 AndAlso McVersionCurrent.Version.McCodeMain > 0 Then
-                '<1.7：至多 Java 8（Java 9 - 10 未测试）
+                '<1.7：至多 Java 8
                 MaxVer = New Version(1, 8, 999, 999)
             ElseIf McVersionCurrent.Version.McCodeMain >= 8 AndAlso McVersionCurrent.Version.McCodeMain <= 11 Then
-                '1.8 - 1.11：必须恰好 Java 8（Java 9 - 10 未测试）
+                '1.8 - 1.11：必须恰好 Java 8
                 MinVer = New Version(1, 8, 0, 0) : MaxVer = New Version(1, 8, 999, 999)
+            ElseIf McVersionCurrent.Version.McCodeMain = 12 AndAlso McVersionCurrent.Version.HasForge Then
+                '1.12：若安装了 Forge，最高 Java 8
+                MaxVer = New Version(1, 8, 999, 999)
             End If
         End If
 
@@ -1129,12 +1132,12 @@ SystemBrowser:
                 '1.7.2：必须 Java 7
                 MinVer = New Version(1, 7, 0, 0) : MaxVer = New Version(1, 7, 999, 999)
             ElseIf McVersionCurrent.Version.McCodeMain <= 12 AndAlso McVersionCurrent.Version.McCodeMain > 0 AndAlso VersionSortBoolean("14.23.5.2855", McVersionCurrent.Version.ForgeVersion) Then
-                '<1.12，Forge 14.23.5.2855 及更低：Java 8
+                '<=1.12，Forge 14.23.5.2855 及更低：Java 8
                 MaxVer = New Version(1, 8, 999, 999)
-            ElseIf McVersionCurrent.Version.McCodeMain <= 14 AndAlso McVersionCurrent.Version.McCodeMain > 0 AndAlso VersionSortBoolean("28.2.23", McVersionCurrent.Version.ForgeVersion) Then
+            ElseIf McVersionCurrent.Version.McCodeMain <= 14 AndAlso McVersionCurrent.Version.McCodeMain >= 13 AndAlso VersionSortBoolean("28.2.23", McVersionCurrent.Version.ForgeVersion) Then
                 '1.13 - 1.14，Forge 28.2.23 及更低：Java 8 - 10
                 MinVer = New Version(1, 8, 0, 0) : MaxVer = New Version(1, 10, 999, 999)
-            ElseIf McVersionCurrent.Version.McCodeMain <= 15 AndAlso McVersionCurrent.Version.McCodeMain > 0 Then
+            ElseIf McVersionCurrent.Version.McCodeMain = 15 Then
                 '1.15：Java 8 - 15
                 MinVer = New Version(1, 8, 0, 0) : MaxVer = New Version(1, 15, 999, 999)
             ElseIf VersionSortBoolean(McVersionCurrent.Version.ForgeVersion, "34.0.0") AndAlso VersionSortBoolean("36.2.25", McVersionCurrent.Version.ForgeVersion) Then
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb
index a947891..9c8dc16 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb	
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb	
@@ -3105,7 +3105,10 @@ VersionFindFail:
             '弹窗结果
             If MsgResult = 2 Then
                 '下载
-                McDownloadClient(NetPreDownloadBehaviour.HintWhileExists, VersionName, Version("url").ToString)
+                RunInUi(Sub()
+                            PageDownloadInstall.McVersionWaitingForSelect = VersionName
+                            FrmMain.PageChange(FormMain.PageType.Download, FormMain.PageSubType.DownloadInstall)
+                        End Sub)
             End If
 
         Catch ex As Exception
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
index 7062b8b..6d9ae58 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb	
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb	
@@ -640,6 +640,9 @@ Retry:
                     Request.ForgeVersion = Component("version")
                 Case "net.fabricmc.fabric-loader"
                     Request.FabricVersion = Component("version")
+                Case "org.quiltmc.quilt-loader" 'eg. 1.0.0
+                    Hint("PCL 暂不支持安装需要 Quilt 的整合包！", HintType.Critical)
+                    Exit Sub
             End Select
         Next
         '构造加载器
@@ -729,6 +732,10 @@ Retry:
             Hint("该整合包未提供游戏版本信息，无法安装！", HintType.Critical)
             Exit Sub
         End If
+        If Addons.ContainsKey("quilt") Then
+            Hint("PCL 暂不支持安装需要 Quilt 的整合包！", HintType.Critical)
+            Exit Sub
+        End If
         Dim Request As New McInstallRequest With {
             .TargetVersionName = VersionName,
             .MinecraftName = Addons("game"),
diff --git a/Plain Craft Launcher 2/My Project/AssemblyInfo.vb b/Plain Craft Launcher 2/My Project/AssemblyInfo.vb
index 4d13d8e..861ab2e 100644
--- a/Plain Craft Launcher 2/My Project/AssemblyInfo.vb	
+++ b/Plain Craft Launcher 2/My Project/AssemblyInfo.vb	
@@ -51,6 +51,6 @@ Imports System.Runtime.InteropServices
 ' 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 ' 方法是按如下所示使用“*”
 
-<Assembly: AssemblyVersion("2.6.2.0")>
-<Assembly: AssemblyFileVersion("2.6.2.0")>
+<Assembly: AssemblyVersion("2.6.3.0")>
+<Assembly: AssemblyFileVersion("2.6.3.0")>
 <Assembly: NeutralResourcesLanguage("")>
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb
index b53a3b8..8730346 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb	
+++ b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb	
@@ -553,7 +553,7 @@ Public Module ModDownloadLib
                                                                              '拷贝原版文件
                                                                              If Not IsCustomFolder Then Exit Sub
                                                                              SyncLock VanillaSyncLock
-                                                                                 Dim ClientName As String = New DirectoryInfo(ClientDownloadLoader.Input).Name
+                                                                                 Dim ClientName As String = New DirectoryInfo(ClientDownloadLoader.Input).Name '#2031 报告了此处 ClientDownloadLoader.Input 为 null 的问题，但无法复现
                                                                                  Directory.CreateDirectory(McFolder & "versions\" & DownloadInfo.Inherit)
                                                                                  If Not File.Exists(McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".json") Then
                                                                                      CopyFile(ClientDownloadLoader.Input & ClientName & ".json",
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb
index 8a7b4eb..d4034a4 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb	
@@ -571,10 +571,23 @@
                 NewCard.IsSwaped = True
                 PanMinecraft.Children.Add(NewCard)
             Next
+            '自动选择版本
+            If McVersionWaitingForSelect Is Nothing Then Exit Try
+            Log("[Download] 自动选择 MC 版本：" & McVersionWaitingForSelect)
+            For Each Version As JObject In Versions
+                If Version("id").ToString <> McVersionWaitingForSelect Then Continue For
+                Dim Item = McDownloadListItem(Version, Sub()
+                                                       End Sub, False)
+                MinecraftSelected(Item, Nothing)
+            Next
         Catch ex As Exception
             Log(ex, "可视化安装版本列表出错", LogLevel.Feedback)
         End Try
     End Sub
+    ''' <summary>
+    ''' 当 MC 版本列表加载完时，立即自动选择的版本。用于外部调用。
+    ''' </summary>
+    Public Shared McVersionWaitingForSelect As String = Nothing
 
 #End Region
 
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml
index 3546c5d..a19572d 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml	
@@ -33,6 +33,7 @@
                         <TextBlock VerticalAlignment="Center" Grid.Row="2" HorizontalAlignment="Left" Text="版本" Margin="0,0,18,0" />
                         <local:MyComboBox x:Name="TextSearchVersion" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" IsEditable="True" MaxDropDownHeight="320">
                             <local:MyComboBoxItem Content="全部 (也可自行输入)" IsSelected="True" />
+                            <local:MyComboBoxItem Content="1.20.1" />
                             <local:MyComboBoxItem Content="1.20" />
                             <local:MyComboBoxItem Content="1.19.4" />
                             <local:MyComboBoxItem Content="1.18.2" />
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml
index 1926539..aaa688c 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml	
@@ -32,6 +32,7 @@
                         <TextBlock VerticalAlignment="Center" Grid.Row="2" HorizontalAlignment="Left" Text="版本" Margin="0,0,18,0" />
                         <local:MyComboBox x:Name="TextSearchVersion" Grid.Row="2" Grid.Column="1" IsEditable="True" MaxDropDownHeight="320">
                             <local:MyComboBoxItem Content="全部 (也可自行输入)" IsSelected="True" />
+                            <local:MyComboBoxItem Content="1.20.1" />
                             <local:MyComboBoxItem Content="1.20" />
                             <local:MyComboBoxItem Content="1.19.4" />
                             <local:MyComboBoxItem Content="1.18.2" />
@@ -65,7 +66,7 @@
                             <local:MyComboBoxItem Tag="4736/" Content="空岛" />
                             <local:MyComboBoxItem Tag="5128/" Content="原版改良" />
                             <local:MyComboBoxItem Tag="4487/" Content="FTB" 
-                                                  ToolTip="该整合包由 FTB 官方发布" ToolTipService.InitialShowDelay="150" ToolTipService.Placement="Right" ToolTipService.VerticalOffset="-1" ToolTipService.HorizontalOffset="-40" />
+                                                  ToolTip="由 FTB 官方发布" ToolTipService.HorizontalOffset="70" />
                             <local:MyComboBoxItem Tag="4480/" Content="基于地图" />
                             <local:MyComboBoxItem Tag="4481/lightweight" Content="轻量整合" />
                             <local:MyComboBoxItem Tag="4482/" Content="大型整合" />
diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchLeft.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchLeft.xaml.vb
index f692003..1230490 100644
--- a/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchLeft.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchLeft.xaml.vb	
@@ -356,7 +356,7 @@ Finish:
         Select Case Type
             Case 0
                 If FrmLoginLegacy IsNot Nothing AndAlso FrmLoginLegacy.IsReloaded Then
-                    Return New EqualableList(Of String) From {0, If(FrmLoginLegacy.ComboName.Text, "")}
+                    Return New EqualableList(Of String) From {0, If(FrmLoginLegacy.ComboName.Text.Trim, "")}
                 ElseIf Setup.Get("LoginLegacyName") = "" Then
                     Return New EqualableList(Of String) From {0, ""}
                 Else
@@ -526,11 +526,12 @@ Finish:
 
     '版本选择按钮
     Private Sub BtnVersion_Click(sender As Object, e As EventArgs) Handles BtnVersion.Click
+        If McLaunchLoader.State = LoadState.Loading Then Exit Sub
         FrmMain.PageChange(FormMain.PageType.VersionSelect)
     End Sub
     '启动按钮
     Public Sub LaunchButtonClick() Handles BtnLaunch.Click
-        If McLaunchLoader.State = LoadState.Loading OrElse Not BtnLaunch.IsEnabled Then Exit Sub
+        If McLaunchLoader.State = LoadState.Loading OrElse Not BtnLaunch.IsEnabled OrElse FrmMain.PageRight.PageState <> MyPageRight.PageStates.ContentStay Then Exit Sub
         '愚人节处理
         If IsAprilEnabled AndAlso Not IsAprilGiveup Then
             ThemeUnlock(12, False, "隐藏主题 滑稽彩 已解锁！")
@@ -625,8 +626,9 @@ ExitRefresh:
             End Try
         End If
     End Sub
-    '更多按钮
+    '版本设置按钮
     Private Sub BtnMore_Click(sender As Object, e As EventArgs) Handles BtnMore.Click
+        If McLaunchLoader.State = LoadState.Loading Then Exit Sub
         McVersionCurrent.Load()
         PageVersionLeft.Version = McVersionCurrent
         FrmMain.PageChange(FormMain.PageType.VersionSetup, 0)
diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginLegacy.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginLegacy.xaml.vb
index 92d493a..7b3f408 100644
--- a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginLegacy.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginLegacy.xaml.vb	
@@ -17,7 +17,7 @@ Public Class PageLoginLegacy
     Public Sub Reload(KeepInput As Boolean)
         If KeepInput AndAlso IsReloaded Then '避免第一次就以 KeepInput 的方式加载，导致文本框里没东西
             '保留输入，只刷新下拉框列表
-            Dim Input As String = ComboName.Text
+            Dim Input As String = ComboName.Text.Trim
             ComboName.ItemsSource = If(Setup.Get("LoginLegacyName") = "", Nothing, Setup.Get("LoginLegacyName").ToString.Split("¨"))
             ComboName.Text = Input
         Else
@@ -26,7 +26,7 @@ Public Class PageLoginLegacy
                 ComboName.ItemsSource = Nothing
             Else
                 ComboName.ItemsSource = Setup.Get("LoginLegacyName").ToString.Split("¨")
-                ComboName.Text = Setup.Get("LoginLegacyName").ToString.Split("¨")(0)
+                ComboName.Text = Setup.Get("LoginLegacyName").ToString.Split("¨")(0).Trim
             End If
         End If
         IsReloaded = True
@@ -50,17 +50,14 @@ Public Class PageLoginLegacy
         Return IsVaild(GetLoginData())
     End Function
 
+    Private Sub ComboName_PreviewKeyDown(sender As Object, e As Input.KeyEventArgs) Handles ComboName.PreviewKeyDown
+        If e.Key = Key.Space Then
+            Dim Index = CType(ComboName.Template.FindName("PART_EditableTextBox", ComboName), MyTextBox).CaretIndex
+            If Index = ComboName.Text.Length OrElse Index = 0 Then e.Handled = True
+        End If
+    End Sub
     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
+        If Setup.Get("LaunchSkinType") = 0 Then PageLaunchLeft.SkinLegacy.Start(IsForceRestart:=True)
         HintChinese.Visibility = If(RegexCheck(ComboName.Text, "^[0-9A-Za-z_]*$"), Visibility.Collapsed, Visibility.Visible)
     End Sub
     Private Sub Skin_Click() Handles Skin.Click
diff --git a/Plain Craft Launcher 2/Pages/PageSelectLeft.xaml.vb b/Plain Craft Launcher 2/Pages/PageSelectLeft.xaml.vb
index 6b9b40b..3dba754 100644
--- a/Plain Craft Launcher 2/Pages/PageSelectLeft.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageSelectLeft.xaml.vb	
@@ -259,6 +259,7 @@
             Directory.CreateDirectory(Path & ".minecraft\")
             Directory.CreateDirectory(Path & ".minecraft\versions\")
             Setup.Set("LaunchFolderSelect", "$.minecraft\")
+            McFolderLauncherProfilesJsonCreate(Path & ".minecraft\")
             Hint("新建 .minecraft 文件夹成功！", HintType.Finish)
         End If
         McFolderListLoader.Start(IsForceRestart:=True)
diff --git a/Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb b/Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb
index 2b1515b..ea70ccd 100644
--- a/Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb	
@@ -223,7 +223,7 @@
                         DeleteDirectory(Version.Path)
                         Hint("版本 " & Version.Name & " 已永久删除！", HintType.Finish)
                     Else
-                        FileIO.FileSystem.DeleteDirectory(Version.Path, FileIO.UIOption.AllDialogs, FileIO.RecycleOption.SendToRecycleBin)
+                        FileIO.FileSystem.DeleteDirectory(Version.Path, FileIO.UIOption.OnlyErrorDialogs, FileIO.RecycleOption.SendToRecycleBin)
                         Hint("版本 " & Version.Name & " 已删除到回收站！", HintType.Finish)
                     End If
                 Case 2
@@ -251,6 +251,8 @@
                 '同时出现在当前卡片与收藏夹
                 LoaderFolderRun(McVersionListLoader, PathMcFolder, LoaderFolderRunType.ForceRun, MaxDepth:=1, ExtraPath:="versions\")
             End If
+        Catch ex As OperationCanceledException
+            Log(ex, "删除版本 " & Version.Name & " 被主动取消")
         Catch ex As Exception
             Log(ex, "删除版本 " & Version.Name & " 失败", LogLevel.Msgbox)
         End Try
diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml
index a9786b9..4d772ff 100644
--- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml	
@@ -127,7 +127,7 @@
                                 <local:MyComboBoxItem Content="全屏" />
                                 <local:MyComboBoxItem Content="默认大小" IsSelected="True" ToolTip="以 854×480 的默认窗口大小启动 Minecraft" />
                                 <local:MyComboBoxItem Content="与启动器窗口大小一致" />
-                                <local:MyComboBoxItem Content="自定义大小" ToolTip="注意：Forge 1.12.2 等个别版本存在 Bug，会导致高度设定无效" />
+                                <local:MyComboBoxItem Content="自定义大小" ToolTip="注意：Forge 1.12 存在 Bug，会导致高度设定无效" />
                                 <local:MyComboBoxItem Content="最大化" />
                                 <local:MyComboBoxItem Content="保持游戏默认" />
                             </local:MyComboBox>
diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.vb b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.vb
index ec5fccc..a9a511e 100644
--- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.vb	
@@ -433,7 +433,7 @@ PreFin:
         Try
             For Each Java In Sort(JavaList.Clone(), Function(l, r) l.VersionCode < r.VersionCode)
                 Dim ListItem = New MyComboBoxItem With {.Content = Java.ToString, .ToolTip = Java.PathFolder, .Tag = Java}
-                ToolTipService.SetHorizontalOffset(ListItem, 0)
+                ToolTipService.SetHorizontalOffset(ListItem, 400)
                 ComboArgumentJava.Items.Add(ListItem)
                 '判断人为选中
                 If SelectedBySetup = "" Then Continue For
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb
index 2fe2bcd..99667ca 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb	
@@ -345,6 +345,8 @@
             End If
             LoaderFolderRun(McModLoader, PageVersionLeft.Version.PathIndie & "mods\", LoaderFolderRunType.UpdateOnly)
 
+        Catch ex As OperationCanceledException
+            Log(ex, "删除 Mod 被主动取消")
         Catch ex As Exception
             Log(ex, "删除 Mod 失败", LogLevel.Feedback)
         End Try
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml
index 744cb2d..7cc0f0c 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml	
@@ -41,8 +41,7 @@
                         <TextBlock VerticalAlignment="Center" Grid.Row="2" HorizontalAlignment="Left" Text="分类" Margin="0,0,25,0" />
                         <local:MyComboBox Grid.Column="1" Grid.Row="2" x:Name="ComboDisplayType">
                             <local:MyComboBoxItem Content="自动" IsSelected="True" />
-                            <local:MyComboBoxItem Content="从版本列表中隐藏" 
-                                                  ToolTip="该版本默认将不会在版本列表中显示。&#xa;在版本列表页面按下 F11，即可查看所有隐藏的版本。" ToolTipService.HorizontalOffset="-350" />
+                            <local:MyComboBoxItem Content="从版本列表中隐藏" ToolTip="该版本默认将不会在版本列表中显示。&#xa;在版本列表页面按下 F11，即可查看所有隐藏的版本。" />
                             <local:MyComboBoxItem Content="可安装 Mod 的版本" />
                             <local:MyComboBoxItem Content="常规版本" />
                             <local:MyComboBoxItem Content="不常用版本" />
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb
index 72517aa..e4fc8ec 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb	
@@ -325,7 +325,7 @@
                         DeleteDirectory(PageVersionLeft.Version.Path)
                         Hint("版本 " & PageVersionLeft.Version.Name & " 已永久删除！", HintType.Finish)
                     Else
-                        FileIO.FileSystem.DeleteDirectory(PageVersionLeft.Version.Path, FileIO.UIOption.AllDialogs, FileIO.RecycleOption.SendToRecycleBin)
+                        FileIO.FileSystem.DeleteDirectory(PageVersionLeft.Version.Path, FileIO.UIOption.OnlyErrorDialogs, FileIO.RecycleOption.SendToRecycleBin)
                         Hint("版本 " & PageVersionLeft.Version.Name & " 已删除到回收站！", HintType.Finish)
                     End If
                 Case 2
@@ -333,6 +333,8 @@
             End Select
             LoaderFolderRun(McVersionListLoader, PathMcFolder, LoaderFolderRunType.ForceRun, MaxDepth:=1, ExtraPath:="versions\")
             FrmMain.PageBack()
+        Catch ex As OperationCanceledException
+            Log(ex, "删除版本 " & PageVersionLeft.Version.Name & " 被主动取消")
         Catch ex As Exception
             Log(ex, "删除版本 " & PageVersionLeft.Version.Name & " 失败", LogLevel.Msgbox)
         End Try
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml
index 8a0ad8b..90fd1fc 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml	
@@ -44,9 +44,9 @@
                         <local:MyComboBox x:Name="ComboArgumentIndie" Grid.Row="4" Grid.ColumnSpan="2" Tag="VersionArgumentIndie" Grid.Column="1">
                             <local:MyComboBoxItem Content="使用全局设置" IsSelected="True" />
                             <local:MyComboBoxItem Content="开启" 
-                                                  ToolTip="让这个版本与其他版本的存档、Mod 等档案相互独立，互不干涉" ToolTipService.HorizontalOffset="-350"/>
+                                                  ToolTip="让这个版本与其他版本的存档、Mod 等档案相互独立，互不干涉" ToolTipService.HorizontalOffset="100"/>
                             <local:MyComboBoxItem Content="关闭" 
-                                                  ToolTip="与其余未开启隔离的版本均使用同一档案，存档、Mod 等均为公用。&#xa;若存在不同版本的 Forge 或 Fabric，可能会由于 Mod 与版本冲突导致未知问题。" ToolTipService.HorizontalOffset="-350"/>
+                                                  ToolTip="与其余未开启隔离的版本均使用同一档案，存档、Mod 等均为公用。&#xa;若存在不同版本的 Forge 或 Fabric，可能会由于 Mod 与版本冲突导致未知问题。" ToolTipService.HorizontalOffset="100"/>
                         </local:MyComboBox>
                         <TextBlock VerticalAlignment="Center" Grid.Row="6" HorizontalAlignment="Left" Text="游戏 Java" Margin="0,0,25,0" />
                         <local:MyComboBox x:Name="ComboArgumentJava" Grid.ColumnSpan="2" Grid.Row="6" Grid.Column="1" MaxDropDownHeight="240"
@@ -203,9 +203,9 @@
                     <local:MyComboBox x:Name="ComboAdvanceAssets" Grid.Row="4" Grid.ColumnSpan="2" Tag="VersionAdvanceAssets" Grid.Column="1">
                         <local:MyComboBoxItem Content="使用全局设置" IsSelected="True" />
                         <local:MyComboBoxItem Content="开启" 
-                                              ToolTip="在启动 Minecraft 时，简单校验并下载缺失或错误的文件" ToolTipService.HorizontalOffset="-300" />
+                                              ToolTip="在启动 Minecraft 时，简单校验并下载缺失或错误的文件" ToolTipService.HorizontalOffset="100" />
                         <local:MyComboBoxItem Content="关闭" 
-                                              ToolTip="完全不更改 assets；不校验 libraries、第三方登录库与版本主 jar 文件是否被修改。&#xa;如果你没有修改相关文件，请勿勾选此项。" ToolTipService.HorizontalOffset="-300" />
+                                              ToolTip="完全不更改 assets；不校验 libraries、第三方登录库与版本主 jar 文件是否被修改。&#xa;如果你没有修改相关文件，请勿勾选此项。" ToolTipService.HorizontalOffset="100" />
                     </local:MyComboBox>
                     <TextBlock Grid.Row="6" VerticalAlignment="Center" HorizontalAlignment="Left" Text="启动前执行命令" Margin="0,0,25,3" />
                     <local:MyTextBox x:Name="TextAdvanceRun" Grid.Row="6" Grid.ColumnSpan="2" Tag="VersionAdvanceRun" Grid.Column="1" HintText="" Margin="0,0,0,3"
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb
index 2d4604c..6a53849 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb	
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb	
@@ -420,7 +420,7 @@ PreFin:
         Try
             For Each Java In Sort(JavaList.Clone(), Function(l, r) l.VersionCode < r.VersionCode)
                 Dim ListItem = New MyComboBoxItem With {.Content = Java.ToString, .ToolTip = Java.PathFolder, .Tag = Java}
-                ToolTipService.SetHorizontalOffset(ListItem, 0)
+                ToolTipService.SetHorizontalOffset(ListItem, 400)
                 ComboArgumentJava.Items.Add(ListItem)
                 '判断人为选中
                 If SelectedBySetup = "" OrElse SelectedBySetup = "使用全局设置" Then Continue For
diff --git a/Plain Craft Launcher 2/Resources/java-wrapper.jar b/Plain Craft Launcher 2/Resources/java-wrapper.jar
index 306ab362d3aaf9c3897e2d22c626ebcb85821fe9..d6d9414e696b1aa1a00d61d4fc3964816024936e 100644
GIT binary patch
delta 4802
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
Q$O`#bk@F!;{%`Vs02g!hKL7v#

delta 4742
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