From 66bb27c4ddb17922147daa31ecd74c30454fca9c Mon Sep 17 00:00:00 2001
From: huanghongxun <i@huangyuhui.net>
Date: Sat, 21 Aug 2021 15:50:22 +0800
Subject: [PATCH] fix: incorrect detected forge version. Closes #961.

---
 .../jackhuang/hmcl/ui/versions/GameItem.java  |  2 +-
 .../hmcl/download/LibraryAnalyzer.java        | 26 +++++++++++++------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameItem.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameItem.java
index 97d747d05..d3ec5149e 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameItem.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/GameItem.java
@@ -69,7 +69,7 @@ public class GameItem extends Control {
                         if (I18n.hasKey("install.installer." + libraryId)) {
                             libraries.append(", ").append(i18n("install.installer." + libraryId));
                             if (libraryVersion != null)
-                                libraries.append(": ").append(LibraryAnalyzer.modifyVersion(game, libraryVersion.replaceAll("(?i)" + libraryId, "")));
+                                libraries.append(": ").append(libraryVersion.replaceAll("(?i)" + libraryId, ""));
                         }
                     }
 
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java
index 1760244a8..b283d45aa 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java
@@ -25,12 +25,11 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static org.jackhuang.hmcl.util.Pair.pair;
-import static org.jackhuang.hmcl.util.StringUtils.removePrefix;
-import static org.jackhuang.hmcl.util.StringUtils.removeSuffix;
 
 public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMark> {
     private Version version;
@@ -135,7 +134,7 @@ public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMa
         for (Library library : version.resolve(null).getLibraries()) {
             for (LibraryType type : LibraryType.values()) {
                 if (type.matchLibrary(library)) {
-                    libraries.put(type.getPatchId(), pair(library, library.getVersion()));
+                    libraries.put(type.getPatchId(), pair(library, type.patchVersion(library.getVersion())));
                     break;
                 }
             }
@@ -155,14 +154,21 @@ public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMa
         return mainClass != null && (LAUNCH_WRAPPER_MAIN.equals(mainClass) || mainClass.startsWith("net.fabricmc") || mainClass.startsWith("cpw.mods"));
     }
 
-    public static String modifyVersion(String gameVersion, String version) {
-        return removeSuffix(removePrefix(removeSuffix(removePrefix(version.replace(gameVersion, "").trim(), "-"), "-"), "_"), "_");
-    }
-
     public enum LibraryType {
         MINECRAFT(true, "game", Pattern.compile("^$"), Pattern.compile("^$")),
         FABRIC(true, "fabric", Pattern.compile("net\\.fabricmc"), Pattern.compile("fabric-loader")),
-        FORGE(true, "forge", Pattern.compile("net\\.minecraftforge"), Pattern.compile("(forge|fmlloader)")),
+        FORGE(true, "forge", Pattern.compile("net\\.minecraftforge"), Pattern.compile("(forge|fmlloader)")) {
+            private final Pattern FORGE_VERSION_MATCHER = Pattern.compile("^([0-9.]+)-(?<forge>[0-9.]+)(-([0-9.]+))?$");
+
+            @Override
+            public String patchVersion(String libraryVersion) {
+                Matcher matcher = FORGE_VERSION_MATCHER.matcher(libraryVersion);
+                if (matcher.find()) {
+                    return matcher.group("forge");
+                }
+                return super.patchVersion(libraryVersion);
+            }
+        },
         LITELOADER(true, "liteloader", Pattern.compile("com\\.mumfrey"), Pattern.compile("liteloader")),
         OPTIFINE(false, "optifine", Pattern.compile("(net\\.)?optifine"), Pattern.compile("^(?!.*launchwrapper).*$")),
         BOOTSTRAP_LAUNCHER(false, "", Pattern.compile("cpw\\.mods"), Pattern.compile("bootstraplauncher"));
@@ -196,6 +202,10 @@ public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMa
         public boolean matchLibrary(Library library) {
             return group.matcher(library.getGroupId()).matches() && artifact.matcher(library.getArtifactId()).matches();
         }
+
+        public String patchVersion(String libraryVersion) {
+            return libraryVersion;
+        }
     }
 
     public static class LibraryMark {