@@ -124,7 +124,7 @@ public static boolean isCompatible(Platform platform) {
124124 if (Architecture .SYSTEM_ARCH == Architecture .X86_64 )
125125 return architecture == Architecture .X86 ;
126126 if (Architecture .SYSTEM_ARCH == Architecture .ARM64 )
127- return OperatingSystem . SYSTEM_BUILD_NUMBER >= 21277 && architecture == Architecture .X86_64 || architecture == Architecture .X86 ;
127+ return Platform . isSupportedTranslationX86_64 () && architecture == Architecture .X86_64 || architecture == Architecture .X86 ;
128128 break ;
129129 case LINUX :
130130 if (Architecture .SYSTEM_ARCH == Architecture .X86_64 )
@@ -364,13 +364,13 @@ private static Map<Path, JavaRuntime> searchPotentialJavaExecutables(boolean use
364364 if (Architecture .SYSTEM_ARCH == Architecture .X86_64 )
365365 searcher .searchAllJavaInRepository (Platform .WINDOWS_X86 );
366366 if (Architecture .SYSTEM_ARCH == Architecture .ARM64 ) {
367- if (OperatingSystem . SYSTEM_BUILD_NUMBER >= 21277 )
367+ if (Platform . isSupportedTranslationX86_64 () )
368368 searcher .searchAllJavaInRepository (Platform .WINDOWS_X86_64 );
369369 searcher .searchAllJavaInRepository (Platform .WINDOWS_X86 );
370370 }
371371 break ;
372372 case MACOS :
373- if (Architecture .SYSTEM_ARCH == Architecture .ARM64 )
373+ if (Architecture .SYSTEM_ARCH == Architecture .ARM64 && Platform . isSupportedTranslationX86_64 () )
374374 searcher .searchAllJavaInRepository (Platform .MACOS_X86_64 );
375375 break ;
376376 }
@@ -784,13 +784,15 @@ void searchAllOfficialJava(Path directory, boolean verify) {
784784 if (Architecture .SYSTEM_ARCH == Architecture .X86_64 ) {
785785 searchAllOfficialJava (directory , getMojangJavaPlatform (Platform .WINDOWS_X86 ), verify );
786786 } else if (Architecture .SYSTEM_ARCH == Architecture .ARM64 ) {
787- if (OperatingSystem . SYSTEM_BUILD_NUMBER >= 21277 ) {
787+ if (Platform . isSupportedTranslationX86_64 () ) {
788788 searchAllOfficialJava (directory , getMojangJavaPlatform (Platform .WINDOWS_X86_64 ), verify );
789789 }
790790 searchAllOfficialJava (directory , getMojangJavaPlatform (Platform .WINDOWS_X86 ), verify );
791791 }
792- } else if (OperatingSystem .CURRENT_OS == OperatingSystem .MACOS && Architecture .CURRENT_ARCH == Architecture .ARM64 ) {
793- searchAllOfficialJava (directory , getMojangJavaPlatform (Platform .MACOS_X86_64 ), verify );
792+ } else if (OperatingSystem .CURRENT_OS == OperatingSystem .MACOS ) {
793+ if (Architecture .CURRENT_ARCH == Architecture .ARM64 && Platform .isSupportedTranslationX86_64 ()) {
794+ searchAllOfficialJava (directory , getMojangJavaPlatform (Platform .MACOS_X86_64 ), verify );
795+ }
794796 }
795797 }
796798
0 commit comments