From 704d4e9cc08d6445d11e10340dc6675a77220abe Mon Sep 17 00:00:00 2001
From: Burning_TNT <88144530+burningtnt@users.noreply.github.com>
Date: Tue, 28 May 2024 08:28:35 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20#3079=20=E4=BF=AE=E5=A4=8D=20NeoForge=20?=
 =?UTF-8?q?=E6=95=B4=E5=90=88=E5=8C=85=E7=89=88=E6=9C=AC=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98=20(#3082?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix #3079

* Fix.

* Fix: checkstyle.
---
 .../neoforge/NeoForgeBMCLVersionList.java         | 15 +++------------
 .../neoforge/NeoForgeOfficialVersionList.java     | 10 +++-------
 .../download/neoforge/NeoForgeRemoteVersion.java  |  2 +-
 3 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeBMCLVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeBMCLVersionList.java
index 37396af5b..d1d8c8340 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeBMCLVersionList.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeBMCLVersionList.java
@@ -22,10 +22,8 @@ import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 import org.jackhuang.hmcl.download.VersionList;
 import org.jackhuang.hmcl.util.Immutable;
-import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.gson.Validation;
 import org.jackhuang.hmcl.util.io.HttpRequest;
-import org.jackhuang.hmcl.util.versioning.VersionNumber;
 
 import java.util.Collections;
 import java.util.List;
@@ -62,8 +60,7 @@ public final class NeoForgeBMCLVersionList extends VersionList<NeoForgeRemoteVer
     @Override
     public Optional<NeoForgeRemoteVersion> getVersion(String gameVersion, String remoteVersion) {
         if (gameVersion.equals("1.20.1")) {
-            remoteVersion = NeoForgeRemoteVersion.fixInvalidVersion(remoteVersion);
-            remoteVersion = VersionNumber.compare(remoteVersion, "47.1.85") >= 0 ? "1.20.1-" + remoteVersion : remoteVersion;
+            remoteVersion = NeoForgeRemoteVersion.normalize(remoteVersion);
         }
         return super.getVersion(gameVersion, remoteVersion);
     }
@@ -79,16 +76,10 @@ public final class NeoForgeBMCLVersionList extends VersionList<NeoForgeRemoteVer
                     try {
                         versions.clear(gameVersion);
                         for (NeoForgeVersion neoForgeVersion : neoForgeVersions) {
-                            String nf = StringUtils.removePrefix(
-                                    neoForgeVersion.version,
-                                    "1.20.1".equals(gameVersion) ? "1.20.1-forge-" : "neoforge-" // Som of the version numbers for 1.20.1 are like forge.
-                            );
                             versions.put(gameVersion, new NeoForgeRemoteVersion(
                                     neoForgeVersion.mcVersion,
-                                    nf,
-                                    Collections.singletonList(
-                                            apiRoot + "/neoforge/version/" + neoForgeVersion.version + "/download/installer.jar"
-                                    )
+                                    NeoForgeRemoteVersion.normalize(neoForgeVersion.version),
+                                    Collections.singletonList(apiRoot + "/neoforge/version/" + neoForgeVersion.version + "/download/installer.jar")
                             ));
                         }
                     } finally {
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeOfficialVersionList.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeOfficialVersionList.java
index 05b41c9de..fc4292bce 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeOfficialVersionList.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeOfficialVersionList.java
@@ -2,7 +2,6 @@ package org.jackhuang.hmcl.download.neoforge;
 
 import org.jackhuang.hmcl.download.DownloadProvider;
 import org.jackhuang.hmcl.download.VersionList;
-import org.jackhuang.hmcl.util.StringUtils;
 import org.jackhuang.hmcl.util.io.HttpRequest;
 
 import java.util.Collections;
@@ -31,10 +30,7 @@ public final class NeoForgeOfficialVersionList extends VersionList<NeoForgeRemot
     @Override
     public Optional<NeoForgeRemoteVersion> getVersion(String gameVersion, String remoteVersion) {
         if (gameVersion.equals("1.20.1")) {
-            remoteVersion = NeoForgeRemoteVersion.fixInvalidVersion(remoteVersion);
-            if (!remoteVersion.equals("47.1.82")) {
-                remoteVersion = "1.20.1-" + remoteVersion;
-            }
+            remoteVersion = NeoForgeRemoteVersion.normalize(remoteVersion);
         }
         return super.getVersion(gameVersion, remoteVersion);
     }
@@ -52,7 +48,7 @@ public final class NeoForgeOfficialVersionList extends VersionList<NeoForgeRemot
 
                 for (String version : results[0].versions) {
                     versions.put("1.20.1", new NeoForgeRemoteVersion(
-                            "1.20.1", StringUtils.removePrefix(version, "1.20.1-"),
+                            "1.20.1", NeoForgeRemoteVersion.normalize(version),
                             Collections.singletonList(
                                     "https://maven.neoforged.net/releases/net/neoforged/forge/" + version + "/forge-" + version + "-installer.jar"
                             )
@@ -62,7 +58,7 @@ public final class NeoForgeOfficialVersionList extends VersionList<NeoForgeRemot
                 for (String version : results[1].versions) {
                     String mcVersion = "1." + version.substring(0, version.indexOf('.', version.indexOf('.') + 1));
                     versions.put(mcVersion, new NeoForgeRemoteVersion(
-                            mcVersion, version,
+                            mcVersion, NeoForgeRemoteVersion.normalize(version),
                             Collections.singletonList(
                                     "https://maven.neoforged.net/releases/net/neoforged/neoforge/" + version + "/neoforge-" + version + "-installer.jar"
                             )
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeRemoteVersion.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeRemoteVersion.java
index d354e3a1c..85d4631da 100644
--- a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeRemoteVersion.java
+++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/neoforge/NeoForgeRemoteVersion.java
@@ -18,7 +18,7 @@ public class NeoForgeRemoteVersion extends RemoteVersion {
         return new NeoForgeInstallTask(dependencyManager, baseVersion, this);
     }
 
-    public static String fixInvalidVersion(String version) {
+    public static String normalize(String version) {
         if (version.startsWith("1.20.1-")) {
             if (version.startsWith("forge-", "1.20.1-".length())) {
                 return version.substring("1.20.1-forge-".length());