From f157e6b9adfce8572ad698837da132970bd2e903 Mon Sep 17 00:00:00 2001 From: CiiLu <109708109+CiiLu@users.noreply.github.com> Date: Wed, 12 Aug 2026 17:55:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?(65)=20=E4=BD=86=E5=8E=BB=E5=B0=BD=E5=BF=A0?= =?UTF-8?q?=20=E7=9B=BC=E5=BD=92=E8=AF=89=E5=8B=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../download/fabric/FabricVersionList.java | 31 ++----------------- .../legacyfabric/LegacyFabricVersionList.java | 31 ++----------------- .../hmcl/download/quilt/QuiltVersionList.java | 31 ++----------------- 3 files changed, 6 insertions(+), 87 deletions(-) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricVersionList.java index b71a7fb300a..ac727c18737 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricVersionList.java @@ -22,7 +22,6 @@ import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.io.NetworkUtils; -import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.util.Collections; @@ -68,39 +67,13 @@ public Task refreshAsync() { private List getGameVersions(String metaUrl) throws IOException { String json = NetworkUtils.doGet(downloadProvider.injectURLWithCandidates(metaUrl)); return JsonUtils.GSON.fromJson(json, listTypeOf(GameVersion.class)) - .stream().map(GameVersion::getVersion).collect(Collectors.toList()); + .stream().map(GameVersion::version).collect(Collectors.toList()); } private static String getLaunchMetaUrl(String gameVersion, String loaderVersion) { return String.format("https://meta.fabricmc.net/v2/versions/loader/%s/%s", gameVersion, loaderVersion); } - private static class GameVersion { - private final String version; - private final String maven; - private final boolean stable; - - public GameVersion() { - this("", null, false); - } - - public GameVersion(String version, String maven, boolean stable) { - this.version = version; - this.maven = maven; - this.stable = stable; - } - - public String getVersion() { - return version; - } - - @Nullable - public String getMaven() { - return maven; - } - - public boolean isStable() { - return stable; - } + private record GameVersion(String version, String maven, boolean stable) { } } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricVersionList.java index 4236cb0640c..acc9f9d60af 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricVersionList.java @@ -22,7 +22,6 @@ import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.io.NetworkUtils; -import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.util.Collections; @@ -71,7 +70,7 @@ public Task refreshAsync() { private List getGameVersions(String metaUrl) throws IOException { String json = NetworkUtils.doGet(downloadProvider.injectURLWithCandidates(metaUrl)); return JsonUtils.GSON.fromJson(json, listTypeOf(GameVersion.class)) - .stream().map(GameVersion::getVersion).collect(Collectors.toList()); + .stream().map(GameVersion::version).collect(Collectors.toList()); } private static String normalizeVersion(String version) { @@ -84,32 +83,6 @@ private static String getLaunchMetaUrl(String gameVersion, String loaderVersion) return String.format("https://meta.legacyfabric.net/v2/versions/loader/%s/%s", gameVersion, loaderVersion); } - private static class GameVersion { - private final String version; - private final String maven; - private final boolean stable; - - public GameVersion() { - this("", null, false); - } - - public GameVersion(String version, String maven, boolean stable) { - this.version = version; - this.maven = maven; - this.stable = stable; - } - - public String getVersion() { - return version; - } - - @Nullable - public String getMaven() { - return maven; - } - - public boolean isStable() { - return stable; - } + private record GameVersion(String version, String maven, boolean stable) { } } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltVersionList.java index c33d0acf0ab..434fe4ef796 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltVersionList.java @@ -22,7 +22,6 @@ import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.util.gson.JsonUtils; import org.jackhuang.hmcl.util.io.NetworkUtils; -import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.util.Collections; @@ -68,39 +67,13 @@ public Task refreshAsync() { private List getGameVersions(String metaUrl) throws IOException { String json = NetworkUtils.doGet(downloadProvider.injectURLWithCandidates(metaUrl)); return JsonUtils.GSON.fromJson(json, listTypeOf(GameVersion.class)) - .stream().map(GameVersion::getVersion).collect(Collectors.toList()); + .stream().map(GameVersion::version).collect(Collectors.toList()); } private static String getLaunchMetaUrl(String gameVersion, String loaderVersion) { return String.format("https://meta.quiltmc.org/v3/versions/loader/%s/%s", gameVersion, loaderVersion); } - private static class GameVersion { - private final String version; - private final String maven; - private final boolean stable; - - public GameVersion() { - this("", null, false); - } - - public GameVersion(String version, String maven, boolean stable) { - this.version = version; - this.maven = maven; - this.stable = stable; - } - - public String getVersion() { - return version; - } - - @Nullable - public String getMaven() { - return maven; - } - - public boolean isStable() { - return stable; - } + private record GameVersion(String version, String maven, boolean stable) { } } From 494ee8c4b234dae04f0f0a6583528d1875372762 Mon Sep 17 00:00:00 2001 From: CiiLu <109708109+CiiLu@users.noreply.github.com> Date: Wed, 12 Aug 2026 18:14:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BD=95=E6=84=8F=E5=91=B3=E6=98=AF?= =?UTF-8?q?=E4=BB=80=E4=B9=88=E6=84=8F=E6=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jackhuang/hmcl/download/fabric/FabricVersionList.java | 1 + .../hmcl/download/legacyfabric/LegacyFabricVersionList.java | 1 + .../java/org/jackhuang/hmcl/download/quilt/QuiltVersionList.java | 1 + 3 files changed, 3 insertions(+) diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricVersionList.java index ac727c18737..bef8edd08b7 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricVersionList.java @@ -75,5 +75,6 @@ private static String getLaunchMetaUrl(String gameVersion, String loaderVersion) } private record GameVersion(String version, String maven, boolean stable) { + } } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricVersionList.java index acc9f9d60af..119934ef76b 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/legacyfabric/LegacyFabricVersionList.java @@ -84,5 +84,6 @@ private static String getLaunchMetaUrl(String gameVersion, String loaderVersion) } private record GameVersion(String version, String maven, boolean stable) { + } } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltVersionList.java index 434fe4ef796..e7b7e9f92dc 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/quilt/QuiltVersionList.java @@ -75,5 +75,6 @@ private static String getLaunchMetaUrl(String gameVersion, String loaderVersion) } private record GameVersion(String version, String maven, boolean stable) { + } }