diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java index 12ae6c9f5..54259c921 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadListPage.java @@ -118,7 +118,7 @@ public class DownloadListPage extends Control implements DecoratorPage, VersionP if (!searchInitialized) { searchInitialized = true; - search("", null, 0, "", 0); + search("", null, 0, "", RemoteModRepository.SortType.DATE_CREATED); } if (versionSelection) { diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModDownloadListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModDownloadListPage.java index 62d49f4fe..1c1760fa6 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModDownloadListPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModDownloadListPage.java @@ -48,7 +48,7 @@ public class ModDownloadListPage extends DownloadListPage { private class Repository implements RemoteModRepository { @Override - public Stream search(String gameVersion, Category category, int pageOffset, int pageSize, String searchFilter, int sort) throws IOException { + public Stream search(String gameVersion, Category category, int pageOffset, int pageSize, String searchFilter, SortType sort) throws IOException { String newSearchFilter; if (StringUtils.CHINESE_PATTERN.matcher(searchFilter).find()) { List mods = ModTranslations.searchMod(searchFilter); diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricAPIVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricAPIVersionList.java index 1a80fca25..43a3dc6fa 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricAPIVersionList.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/fabric/FabricAPIVersionList.java @@ -23,11 +23,8 @@ import org.jackhuang.hmcl.mod.RemoteMod; import org.jackhuang.hmcl.mod.modrinth.ModrinthRemoteModRepository; import org.jackhuang.hmcl.util.Lang; -import java.util.Collection; import java.util.Collections; import java.util.concurrent.CompletableFuture; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import static org.jackhuang.hmcl.util.Lang.wrap; @@ -55,16 +52,4 @@ public class FabricAPIVersionList extends VersionList { } })); } - - @Override - protected Collection getVersionsImpl(String gameVersion) { - Matcher matcher = GAME_VERSION_PATTERN.matcher(gameVersion); - if (matcher.find()) { - return super.getVersionsImpl(String.format("%s.%s", matcher.group("major"), matcher.group("minor"))); - } - return super.getVersionsImpl(gameVersion); - } - - private static final Pattern FABRIC_VERSION_PATTERN = Pattern.compile("^(?[0-9.]+)\\+(build\\.(?\\d+)-)?(?[0-9.]+)$"); - private static final Pattern GAME_VERSION_PATTERN = Pattern.compile("^(?[0-9]+)\\.(?[0-9]+)"); }