[release/3.6] 在 ./.hmcl/java 中搜索 Java (#4434)

Glavo · web-flow · commit 1654c652e025 · 2025-09-10T21:37:45.000+08:00
#4179
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/java/JavaManager.java b/HMCL/src/main/java/org/jackhuang/hmcl/java/JavaManager.java
@@ -56,6 +56,7 @@ private JavaManager() {
     }
 
     public static final HMCLJavaRepository REPOSITORY = new HMCLJavaRepository(Metadata.HMCL_GLOBAL_DIRECTORY.resolve("java"));
+    public static final HMCLJavaRepository LOCAL_REPOSITORY = new HMCLJavaRepository(Metadata.HMCL_CURRENT_DIRECTORY.resolve("java"));
 
     public static String getMojangJavaPlatform(Platform platform) {
         if (platform.getOperatingSystem() == OperatingSystem.WINDOWS) {
@@ -561,6 +562,10 @@ private static void searchAllJavaInRepository(Map<Path, JavaRuntime> javaRuntime
         for (JavaRuntime java : REPOSITORY.getAllJava(platform)) {
             javaRuntimes.put(java.getBinary(), java);
         }
+
+        for (JavaRuntime java : LOCAL_REPOSITORY.getAllJava(platform)) {
+            javaRuntimes.put(java.getBinary(), java);
+        }
     }
 
     private static void searchAllOfficialJava(Map<Path, JavaRuntime> javaRuntimes, Path directory, boolean verify) {

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ private JavaManager() {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public static final HMCLJavaRepository REPOSITORY = new HMCLJavaRepository(Metadata.HMCL_GLOBAL_DIRECTORY.resolve("java"));`
	`59`	`+ public static final HMCLJavaRepository LOCAL_REPOSITORY = new HMCLJavaRepository(Metadata.HMCL_CURRENT_DIRECTORY.resolve("java"));`
`59`	`60`
`60`	`61`	`public static String getMojangJavaPlatform(Platform platform) {`
`61`	`62`	`if (platform.getOperatingSystem() == OperatingSystem.WINDOWS) {`
`@@ -561,6 +562,10 @@ private static void searchAllJavaInRepository(Map<Path, JavaRuntime> javaRuntime`
`561`	`562`	`for (JavaRuntime java : REPOSITORY.getAllJava(platform)) {`
`562`	`563`	`javaRuntimes.put(java.getBinary(), java);`
`563`	`564`	`}`
	`565`	`+`
	`566`	`+ for (JavaRuntime java : LOCAL_REPOSITORY.getAllJava(platform)) {`
	`567`	`+ javaRuntimes.put(java.getBinary(), java);`
	`568`	`+ }`
`564`	`569`	`}`
`565`	`570`
`566`	`571`	`private static void searchAllOfficialJava(Map<Path, JavaRuntime> javaRuntimes, Path directory, boolean verify) {`