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 1/3] =?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 3d54dfc..93f309a 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 2/3] =?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 93f309a..7e0ab4f 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 3/3] =?UTF-8?q?chore(ModJava):=E5=88=A0=E6=8E=89=E5=A4=9A?=
 =?UTF-8?q?=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 7e0ab4f..9abb7fe 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