From 5b345affec1c9e38853adf41e92f89ccc7c1b065 Mon Sep 17 00:00:00 2001
From: Glavo <zjx001202@gmail.com>
Date: Tue, 15 Oct 2024 18:47:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20Java=20=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=20(#3342)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* update

* update
---
 .../java/disco/DiscoFetchJavaListTask.java    |  2 +-
 .../java/disco/DiscoJavaDistribution.java     | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoFetchJavaListTask.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoFetchJavaListTask.java
index 036822ce5..d4f333b34 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoFetchJavaListTask.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoFetchJavaListTask.java
@@ -79,7 +79,7 @@ public final class DiscoFetchJavaListTask extends Task<TreeMap<Integer, DiscoJav
         TreeMap<Integer, DiscoJavaRemoteVersion> map = new TreeMap<>();
 
         for (DiscoJavaRemoteVersion version : result) {
-            if (!distribution.getApiParameter().equals(version.getDistribution()))
+            if (!distribution.testVersion(version))
                 continue;
 
             int jdkVersion = version.getJdkVersion();
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoJavaDistribution.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoJavaDistribution.java
index 80611d674..7cc6c3e20 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoJavaDistribution.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/java/disco/DiscoJavaDistribution.java
@@ -46,7 +46,16 @@ public enum DiscoJavaDistribution implements JavaDistribution<DiscoJavaRemoteVer
             EnumSet.of(JDK, JRE, JDKFX, JREFX),
             pair(WINDOWS, EnumSet.of(X86_64, X86, ARM64)),
             pair(LINUX, EnumSet.of(X86_64, X86, ARM64, ARM32, RISCV64, PPC64LE)),
-            pair(OSX, EnumSet.of(X86_64, ARM64))),
+            pair(OSX, EnumSet.of(X86_64, ARM64))) {
+        @Override
+        public boolean testVersion(DiscoJavaRemoteVersion version) {
+            if (!super.testVersion(version))
+                return false;
+
+            String fileName = version.getFileName();
+            return !fileName.endsWith("-lite.tar.gz") && !fileName.endsWith("-lite.zip");
+        }
+    },
     ZULU("Zulu", "zulu", "Azul",
             EnumSet.of(JDK, JRE, JDKFX, JREFX),
             pair(WINDOWS, EnumSet.of(X86_64, X86, ARM64)),
@@ -54,8 +63,8 @@ public enum DiscoJavaDistribution implements JavaDistribution<DiscoJavaRemoteVer
             pair(OSX, EnumSet.of(X86_64, ARM64))),
     GRAALVM("GraalVM", "graalvm", "Oracle",
             EnumSet.of(JDK),
-            pair(WINDOWS, EnumSet.of(X86_64, X86)),
-            pair(LINUX, EnumSet.of(X86_64, X86, ARM64, ARM32, RISCV64, PPC64LE)),
+            pair(WINDOWS, EnumSet.of(X86_64)),
+            pair(LINUX, EnumSet.of(X86_64, ARM64)),
             pair(OSX, EnumSet.of(X86_64, ARM64)));
 
     public static DiscoJavaDistribution of(String name) {
@@ -113,4 +122,8 @@ public enum DiscoJavaDistribution implements JavaDistribution<DiscoJavaRemoteVer
     public Task<TreeMap<Integer, DiscoJavaRemoteVersion>> getFetchJavaVersionsTask(DownloadProvider provider, Platform platform, JavaPackageType packageType) {
         return new DiscoFetchJavaListTask(provider, this, platform, packageType);
     }
+
+    public boolean testVersion(DiscoJavaRemoteVersion version) {
+        return this.getApiParameter().equals(version.getDistribution());
+    }
 }