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 b71a7fb300..ed2e10b3a5 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 @@ -20,9 +20,9 @@ package org.jackhuang.hmcl.download.fabric; import org.jackhuang.hmcl.download.DownloadProvider; import org.jackhuang.hmcl.download.VersionList; import org.jackhuang.hmcl.task.Task; +import org.jackhuang.hmcl.util.gson.JsonSerializable; 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 +68,14 @@ public final class FabricVersionList extends VersionList { 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; - } + @JsonSerializable + 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 4236cb0640..272f82f8cd 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 @@ -20,9 +20,9 @@ package org.jackhuang.hmcl.download.legacyfabric; import org.jackhuang.hmcl.download.DownloadProvider; import org.jackhuang.hmcl.download.VersionList; import org.jackhuang.hmcl.task.Task; +import org.jackhuang.hmcl.util.gson.JsonSerializable; 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 +71,7 @@ public final class LegacyFabricVersionList extends VersionList 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 +84,7 @@ public final class LegacyFabricVersionList extends VersionList { 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; - } + @JsonSerializable + private record GameVersion(String version, String maven, boolean stable) { } }