Merge branch 'unlisted'

ShirosakiMio · ShirosakiMio · commit fba65fa78562 · 2026-01-01T14:37:01.000+08:00
diff --git a/FCL/src/main/assets/game/unlisted-versions.json b/FCL/src/main/assets/game/unlisted-versions.json
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/InstallVersionPage.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/InstallVersionPage.java
@@ -84,6 +84,8 @@ private List<RemoteVersion> loadVersions() {
                     switch (it.getVersionType()) {
                         case RELEASE:
                             return checkRelease.isChecked();
+                        case PENDING:
+                        case UNOBFUSCATED:
                         case SNAPSHOT:
                             if (checkSnapShot.isChecked()) return true;
                             else if (checkAprilFools.isChecked())
diff --git a/FCL/src/main/java/com/tungsten/fcl/ui/download/RemoteVersionListAdapter.java b/FCL/src/main/java/com/tungsten/fcl/ui/download/RemoteVersionListAdapter.java
@@ -25,6 +25,7 @@
 import com.tungsten.fclcore.download.optifine.OptiFineRemoteVersion;
 import com.tungsten.fclcore.download.quilt.QuiltAPIRemoteVersion;
 import com.tungsten.fclcore.download.quilt.QuiltRemoteVersion;
+import com.tungsten.fclcore.util.versioning.GameVersionNumber;
 import com.tungsten.fcllibrary.component.FCLAdapter;
 import com.tungsten.fcllibrary.component.theme.ThemeEngine;
 import com.tungsten.fcllibrary.component.view.FCLImageButton;
@@ -137,7 +138,12 @@ else if (remoteVersion instanceof GameRemoteVersion) {
             switch (remoteVersion.getVersionType()) {
                 case RELEASE:
                     return getContext().getDrawable(R.drawable.img_grass);
+                case PENDING:
+                case UNOBFUSCATED:
                 case SNAPSHOT:
+                    if (GameVersionNumber.asGameVersion(remoteVersion.getGameVersion()).isAprilFools()) {
+                        return getContext().getDrawable(R.drawable.april_fools);
+                    }
                     return getContext().getDrawable(R.drawable.img_command);
                 default:
                     return getContext().getDrawable(R.drawable.img_craft_table);
@@ -152,6 +158,8 @@ private String getTag(RemoteVersion remoteVersion) {
             switch (remoteVersion.getVersionType()) {
                 case RELEASE:
                     return getContext().getString(R.string.version_game_release);
+                case UNOBFUSCATED:
+                case PENDING:
                 case SNAPSHOT:
                     return getContext().getString(R.string.version_game_snapshot);
                 default:
diff --git a/FCL/src/main/res/drawable/april_fools.png b/FCL/src/main/res/drawable/april_fools.png
diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/download/BMCLAPIDownloadProvider.java b/FCLCore/src/main/java/com/tungsten/fclcore/download/BMCLAPIDownloadProvider.java
@@ -78,7 +78,8 @@ public BMCLAPIDownloadProvider(String apiRoot) {
                 pair("https://authlib-injector.yushi.moe", apiRoot + "/mirrors/authlib-injector"),
                 pair("https://repo1.maven.org/maven2", "https://mirrors.cloud.tencent.com/nexus/repository/maven-public"),
                 pair("https://repo.maven.apache.org/maven2", "https://mirrors.cloud.tencent.com/nexus/repository/maven-public"),
-                pair("https://hmcl-dev.github.io/metadata/cleanroom", "https://alist.8mi.tech/d/mirror/HMCL-Metadata/Auto/cleanroom")
+                pair("https://hmcl.glavo.site/metadata/cleanroom", "https://alist.8mi.tech/d/mirror/HMCL-Metadata/Auto/cleanroom"),
+                pair("https://zkitefly.github.io/unlisted-versions-of-minecraft", "https://alist.8mi.tech/d/mirror/unlisted-versions-of-minecraft/Auto")
                 // https://github.com/mcmod-info-mirror/mcim-rust-api
 //                pair("https://api.modrinth.com", "https://mod.mcimirror.top/modrinth"),
 //                pair("https://cdn.modrinth.com", "https://mod.mcimirror.top"),
diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/download/RemoteVersion.java b/FCLCore/src/main/java/com/tungsten/fclcore/download/RemoteVersion.java
@@ -125,6 +125,8 @@ public enum Type {
         UNCATEGORIZED,
         RELEASE,
         SNAPSHOT,
-        OLD
+        OLD,
+        PENDING,
+        UNOBFUSCATED
     }
 }
diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/download/cleanroom/CleanroomVersionList.java b/FCLCore/src/main/java/com/tungsten/fclcore/download/cleanroom/CleanroomVersionList.java
@@ -31,8 +31,8 @@
 
 public final class CleanroomVersionList extends VersionList<CleanroomRemoteVersion> {
     private final DownloadProvider downloadProvider;
-    private static final String LOADER_LIST_URL = "https://hmcl-dev.github.io/metadata/cleanroom/index.json";
-    private static final String INSTALLER_URL = "https://hmcl-dev.github.io/metadata/cleanroom/files/cleanroom-%s-installer.jar";
+    private static final String LOADER_LIST_URL = "https://hmcl.glavo.site/metadata/cleanroom/index.json";
+    private static final String INSTALLER_URL = "https://hmcl.glavo.site/metadata/cleanroom/files/cleanroom-%s-installer.jar";
 
     public CleanroomVersionList(DownloadProvider downloadProvider) {
         this.downloadProvider = downloadProvider;
diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/download/forge/ForgeVersionList.java b/FCLCore/src/main/java/com/tungsten/fclcore/download/forge/ForgeVersionList.java
@@ -101,5 +101,5 @@ public CompletableFuture<?> refreshAsync() {
                 });
     }
 
-    public static final String FORGE_LIST = "https://hmcl-dev.github.io/metadata/forge/";
+    public static final String FORGE_LIST = "https://hmcl.glavo.site/metadata/forge/";
 }
diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/download/game/GameRemoteVersion.java b/FCLCore/src/main/java/com/tungsten/fclcore/download/game/GameRemoteVersion.java
@@ -63,6 +63,10 @@ private static Type getReleaseType(ReleaseType type) {
                 return Type.SNAPSHOT;
             case UNKNOWN:
                 return Type.UNCATEGORIZED;
+            case PENDING:
+                return Type.PENDING;
+            case UNOBFUSCATED:
+                return Type.UNOBFUSCATED;
             default:
                 return Type.OLD;
         }
diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/download/game/GameVersionList.java b/FCLCore/src/main/java/com/tungsten/fclcore/download/game/GameVersionList.java
@@ -17,13 +17,19 @@
  */
 package com.tungsten.fclcore.download.game;
 
+import static com.tungsten.fclcore.util.Logging.LOG;
+
 import com.tungsten.fclcore.download.DownloadProvider;
 import com.tungsten.fclcore.download.VersionList;
+import com.tungsten.fclcore.util.gson.JsonUtils;
 import com.tungsten.fclcore.util.io.HttpRequest;
 
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
+import java.util.logging.Level;
 
 public final class GameVersionList extends VersionList<GameRemoteVersion> {
     private final DownloadProvider downloadProvider;
@@ -46,10 +52,28 @@ protected Collection<GameRemoteVersion> getVersionsImpl(String gameVersion) {
     public CompletableFuture<?> refreshAsync() {
         return HttpRequest.GET(downloadProvider.getVersionListURL()).getJsonAsync(GameRemoteVersions.class)
                 .thenAcceptAsync(root -> {
+                    GameRemoteVersions unlistedVersions = null;
+                    try (Reader input = new InputStreamReader(
+                            GameVersionList.class.getResourceAsStream("/assets/game/unlisted-versions.json"))) {
+                        unlistedVersions = JsonUtils.GSON.fromJson(input, GameRemoteVersions.class);
+                    } catch (Throwable e) {
+                        LOG.log(Level.WARNING, "Failed to load unlisted versions", e);
+                    }
+
                     lock.writeLock().lock();
                     try {
                         versions.clear();
 
+                        if (unlistedVersions != null) {
+                            for (GameRemoteVersionInfo unlistedVersion : unlistedVersions.getVersions()) {
+                                versions.put(unlistedVersion.getGameVersion(), new GameRemoteVersion(
+                                        unlistedVersion.getGameVersion(),
+                                        unlistedVersion.getGameVersion(),
+                                        Collections.singletonList(unlistedVersion.getUrl()),
+                                        unlistedVersion.getType(), unlistedVersion.getReleaseTime()));
+                            }
+                        }
+
                         for (GameRemoteVersionInfo remoteVersion : root.getVersions()) {
                             versions.put(remoteVersion.getGameVersion(), new GameRemoteVersion(
                                     remoteVersion.getGameVersion(),
diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/game/ReleaseType.java b/FCLCore/src/main/java/com/tungsten/fclcore/game/ReleaseType.java
@@ -23,6 +23,8 @@ public enum ReleaseType {
     MODIFIED("modified"),
     OLD_BETA("old-beta"),
     OLD_ALPHA("old-alpha"),
+    PENDING("pending"),
+    UNOBFUSCATED("unobfuscated"),
     UNKNOWN("unknown");
 
     private final String id;
diff --git a/FCLCore/src/main/java/com/tungsten/fclcore/util/versioning/GameVersionNumber.java b/FCLCore/src/main/java/com/tungsten/fclcore/util/versioning/GameVersionNumber.java
@@ -104,7 +104,7 @@ public static VersionRange<GameVersionNumber> atMost(String maximum) {
     }
 
     public boolean isAprilFools() {
-        if (this instanceof Special) {
+        if (this instanceof Special && !value.endsWith("_unobfuscated")) {
             String normalizedVersion = this.toNormalizedString();
             return !normalizedVersion.startsWith("1.") && !normalizedVersion.equals("13w12~")
                     || normalizedVersion.equals("1.RV-Pre1");

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,8 @@ public enum Type {`
`125`	`125`	`UNCATEGORIZED,`
`126`	`126`	`RELEASE,`
`127`	`127`	`SNAPSHOT,`
`128`		`- OLD`
	`128`	`+ OLD,`
	`129`	`+ PENDING,`
	`130`	`+ UNOBFUSCATED`
`129`	`131`	`}`
`130`	`132`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,5 +101,5 @@ public CompletableFuture<?> refreshAsync() {`
`101`	`101`	`});`
`102`	`102`	`}`
`103`	`103`
`104`		`- public static final String FORGE_LIST = "https://hmcl-dev.github.io/metadata/forge/";`
	`104`	`+ public static final String FORGE_LIST = "https://hmcl.glavo.site/metadata/forge/";`
`105`	`105`	`}`