fix: 修复分类

Author: ShirosakiMio

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())

FCLCore/src/main/java/com/tungsten/fclcore/download/BMCLAPIDownloadProvider.java

@@ -78,7 +78,7 @@ 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"),

FCLCore/src/main/java/com/tungsten/fclcore/download/RemoteVersion.java

@@ -125,6 +125,8 @@ public enum Type {
         UNCATEGORIZED,
         RELEASE,
         SNAPSHOT,
-        OLD
+        OLD,
+        PENDING,
+        UNOBFUSCATED
     }
 }

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;

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/";
 }

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;
         }

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;

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");