From f3434fe2a8147bd334ae0a6ccb2546ccdee8f8fd Mon Sep 17 00:00:00 2001
From: huanghongxun <huanghongxun2008@126.com>
Date: Tue, 14 Jan 2020 10:58:15 +0800
Subject: [PATCH] Fix #644

---
 .../java/org/jackhuang/hmcl/download/VersionList.java |  2 +-
 .../hmcl/download/forge/ForgeBMCLVersionList.java     | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/VersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/VersionList.java
index bbcdba46b..0b860ffad 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/VersionList.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/VersionList.java
@@ -127,7 +127,7 @@ public abstract class VersionList<T extends RemoteVersion> {
      * @param remoteVersion the version of the remote version.
      * @return the specific remote version, null if it is not found.
      */
-    public final Optional<T> getVersion(String gameVersion, String remoteVersion) {
+    public Optional<T> getVersion(String gameVersion, String remoteVersion) {
         lock.readLock().lock();
         try {
             T result = null;
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeBMCLVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeBMCLVersionList.java
index ab24d517e..9005f038a 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeBMCLVersionList.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/forge/ForgeBMCLVersionList.java
@@ -31,10 +31,7 @@ import org.jackhuang.hmcl.util.io.NetworkUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 import static org.jackhuang.hmcl.util.Lang.mapOf;
 import static org.jackhuang.hmcl.util.Pair.pair;
@@ -113,6 +110,12 @@ public final class ForgeBMCLVersionList extends VersionList<ForgeRemoteVersion>
         };
     }
 
+    @Override
+    public Optional<ForgeRemoteVersion> getVersion(String gameVersion, String remoteVersion) {
+        remoteVersion = StringUtils.substringAfter(remoteVersion, "-", remoteVersion);
+        return super.getVersion(gameVersion, remoteVersion);
+    }
+
     @Immutable
     public static final class ForgeVersion implements Validation {