From 72b5428f8b5d231a92e64234bed1a6f41bbef5fb Mon Sep 17 00:00:00 2001
From: Glavo <zjx001202@gmail.com>
Date: Sat, 22 Feb 2025 17:28:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20NeoForge=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E8=AF=86=E5=88=AB=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#3638)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hmcl/download/LibraryAnalyzer.java        | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

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 e88e14039..950794244 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java
@@ -216,11 +216,6 @@ public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMa
 
             @Override
             protected String patchVersion(Version gameVersion, String libraryVersion) {
-                Matcher matcher = NEO_FORGE_VERSION_MATCHER.matcher(libraryVersion);
-                if (matcher.find()) {
-                    return matcher.group("forge");
-                }
-
                 String res = scanVersion(gameVersion);
                 if (res != null) {
                     return res;
@@ -233,6 +228,11 @@ public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMa
                     }
                 }
 
+                Matcher matcher = NEO_FORGE_VERSION_MATCHER.matcher(libraryVersion);
+                if (matcher.find()) {
+                    return matcher.group("forge");
+                }
+
                 return super.patchVersion(gameVersion, libraryVersion);
             }
 
@@ -248,12 +248,15 @@ public final class LibraryAnalyzer implements Iterable<LibraryAnalyzer.LibraryMa
 
                 for (int i = 0; i < gameArguments.size() - 1; i++) {
                     Argument argument = gameArguments.get(i);
-                    if (argument instanceof StringArgument && "--fml.neoForgeVersion".equals(((StringArgument) argument).getArgument())) {
-                        Argument next = gameArguments.get(i + 1);
-                        if (next instanceof StringArgument) {
-                            return ((StringArgument) next).getArgument();
+                    if (argument instanceof StringArgument) {
+                        String argumentValue = ((StringArgument) argument).getArgument();
+                        if ("--fml.neoForgeVersion".equals(argumentValue) || "--fml.forgeVersion".equals(argumentValue)) {
+                            Argument next = gameArguments.get(i + 1);
+                            if (next instanceof StringArgument) {
+                                return ((StringArgument) next).getArgument();
+                            }
+                            return null; // Normally, there should not be two --fml.neoForgeVersion argument.
                         }
-                        return null; // Normally, there should not be two --fml.neoForgeVersion argument.
                     }
                 }
                 return null;