Sfoglia il codice sorgente

Merge pull request #7151 from lingting/main

Java搜索 支持jet 的基础sdk 以及 ~/.jdks 没匹配到可用项修复
龙腾猫跃 1 anno fa
parent
commit
dc7f01dfdd
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb

+ 2 - 2
Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb

@@ -533,7 +533,7 @@ NoUserJava:
                 JavaSearchFolder(Disk.Name, JavaPreList, False)
             Next
             '查找 .jdks 文件夹中的 Java
-            JavaSearchFolder(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\.jdks\", JavaPreList, False)
+            JavaSearchFolder(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) & "\.jdks\", JavaPreList, False, True)
             '查找 APPDATA 文件夹中的 Java
             JavaSearchFolder(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\", JavaPreList, False)
             JavaSearchFolder(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) & "\", JavaPreList, False)
@@ -689,7 +689,7 @@ Wait:
                             "应用", "运行", "前置", "mojang", "官启", "新建文件夹", "eclipse", "microsoft", "hotspot",
                             "runtime", "x86", "x64", "forge", "原版", "optifine", "官方", "启动", "hmcl", "mod", "高清",
                             "download", "launch", "程序", "path", "version", "baka", "pcl", "zulu", "local", "packages",
-                            "4297127d64ec6", "1.", "启动"}
+                            "4297127d64ec6", "1.", "启动", "jbr-"}
             For Each FolderInfo As DirectoryInfo In OriginalPath.EnumerateDirectories
                 If FolderInfo.Attributes.HasFlag(FileAttributes.ReparsePoint) Then Continue For '跳过符号链接
                 Dim SearchEntry = GetFolderNameFromPath(FolderInfo.Name).ToLower '用于搜索的字符串