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..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 @@ -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,14 @@ 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; + private record GameVersion(String version, String maven, 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; - } } } 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..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 @@ -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,7 @@ 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; + private record GameVersion(String version, String maven, 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; - } } } 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..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 @@ -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,14 @@ 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; + private record GameVersion(String version, String maven, 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; - } } }