From c41d944965bde7d7b44e978a820db6abde713ca8 Mon Sep 17 00:00:00 2001 From: Zkitefly <64117916+zkitefly@users.noreply.github.com> Date: Mon, 27 Jan 2025 14:43:06 +0000 Subject: [PATCH] update name --- .../java/org/jackhuang/hmcl/ui/download/VersionsPage.java | 2 +- .../jackhuang/hmcl/download/AdaptedDownloadProvider.java | 4 ++-- .../org/jackhuang/hmcl/download/AutoDownloadProvider.java | 4 ++-- .../jackhuang/hmcl/download/BMCLAPIDownloadProvider.java | 2 +- .../jackhuang/hmcl/download/BalancedDownloadProvider.java | 2 +- .../java/org/jackhuang/hmcl/download/DownloadProvider.java | 2 +- .../org/jackhuang/hmcl/download/MojangDownloadProvider.java | 2 +- .../org/jackhuang/hmcl/download/game/GameVersionList.java | 6 +++--- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java index a34a75c868..504135c05f 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java @@ -320,7 +320,7 @@ public void updateItem(RemoteVersion remoteVersion, boolean empty) { break; } if (remoteVersion.getUrls().stream().anyMatch(url -> url.contains("unlisted-versions-of-minecraft"))) { - content.getTags().add("UVMC"); + content.getTags().add("Unlisted Minecraft"); } } else { VersionIconType iconType; diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/AdaptedDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/AdaptedDownloadProvider.java index 09f1883508..3495cc4474 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/AdaptedDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/AdaptedDownloadProvider.java @@ -49,8 +49,8 @@ public String getVersionListURL() { } @Override - public String getUvmcListURL() { - return getPreferredDownloadProvider().getUvmcListURL(); + public String getUnlistedMinecraftURL() { + return getPreferredDownloadProvider().getUnlistedMinecraftURL(); } @Override diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/AutoDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/AutoDownloadProvider.java index f7c814b3c5..9d1bf7c200 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/AutoDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/AutoDownloadProvider.java @@ -41,8 +41,8 @@ public String getVersionListURL() { } @Override - public String getUvmcListURL() { - return versionListProvider.getUvmcListURL(); + public String getUnlistedMinecraftURL() { + return versionListProvider.getUnlistedMinecraftURL(); } @Override diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java index e398110d81..00843d6ebb 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BMCLAPIDownloadProvider.java @@ -92,7 +92,7 @@ public String getVersionListURL() { } @Override - public String getUvmcListURL() { + public String getUnlistedMinecraftURL() { return "https://vip.123pan.cn/1821946486/unlisted-versions-of-minecraft/version_manifest.json"; } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BalancedDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BalancedDownloadProvider.java index e2dd54827c..23e2ae0b89 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BalancedDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/BalancedDownloadProvider.java @@ -40,7 +40,7 @@ public String getVersionListURL() { } @Override - public String getUvmcListURL() { + public String getUnlistedMinecraftURL() { throw new UnsupportedOperationException(); } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DownloadProvider.java index d6132009da..99a2b21524 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/DownloadProvider.java @@ -33,7 +33,7 @@ public interface DownloadProvider { String getVersionListURL(); - String getUvmcListURL(); + String getUnlistedMinecraftURL(); String getAssetBaseURL(); diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java index 27396862b3..1e7b9acc59 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/MojangDownloadProvider.java @@ -63,7 +63,7 @@ public String getVersionListURL() { } @Override - public String getUvmcListURL() { + public String getUnlistedMinecraftURL() { return "https://zkitefly.github.io/unlisted-versions-of-minecraft/version_manifest.json"; } diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameVersionList.java index 990545c678..afe1f86bb7 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/GameVersionList.java @@ -52,16 +52,16 @@ public CompletableFuture refreshAsync() { CompletableFuture primaryFuture = HttpRequest.GET(downloadProvider.getVersionListURL()) .getJsonAsync(GameRemoteVersions.class); - CompletableFuture uvmcFuture = HttpRequest.GET(downloadProvider.getUvmcListURL()) + CompletableFuture unlistedMinecraftFuture = HttpRequest.GET(downloadProvider.getUnlistedMinecraftURL()) .getJsonAsync(GameRemoteVersions.class); - return CompletableFuture.allOf(primaryFuture, uvmcFuture) + return CompletableFuture.allOf(primaryFuture, unlistedMinecraftFuture) .thenAcceptAsync(ignored -> { lock.writeLock().lock(); try { versions.clear(); - Stream.of(primaryFuture.join(), uvmcFuture.join()) + Stream.of(primaryFuture.join(), unlistedMinecraftFuture.join()) .flatMap(gameRemoteVersions -> gameRemoteVersions.getVersions().stream()) .forEach(remoteVersion -> versions.put( remoteVersion.getGameVersion(),