rename NEO_FORGED to NEO_FORGE (#6008)

CiiLu · web-flow · commit 36568df5b15d · 2026-04-26T13:55:34.000+08:00
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionIconType.java b/HMCL/src/main/java/org/jackhuang/hmcl/setting/VersionIconType.java
@@ -45,7 +45,7 @@ public enum VersionIconType {
     public static VersionIconType getIconType(ModLoaderType modLoaderType) {
         return switch (modLoaderType) {
             case FORGE -> VersionIconType.FORGE;
-            case NEO_FORGED -> VersionIconType.NEO_FORGE;
+            case NEO_FORGE -> VersionIconType.NEO_FORGE;
             case FABRIC -> VersionIconType.FABRIC;
             case QUILT -> VersionIconType.QUILT;
             case LITE_LOADER -> VersionIconType.CHICKEN;
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DownloadPage.java
@@ -441,7 +441,7 @@ private static final class ModItem extends StackPane {
                             case CLEANROOM:
                                 content.addTag(i18n("install.installer.cleanroom"));
                                 break;
-                            case NEO_FORGED:
+                            case NEO_FORGE:
                                 content.addTag(i18n("install.installer.neoforge"));
                                 break;
                             case FABRIC:
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPage.java
@@ -160,11 +160,11 @@ private void updateSupportedLoaders(ModManager modManager) {
 
         if (analyzer.has(LibraryAnalyzer.LibraryType.FABRIC) && modManager.hasMod("kilt", ModLoaderType.FABRIC)) {
             supportedLoaders.add(ModLoaderType.FORGE);
-            supportedLoaders.add(ModLoaderType.NEO_FORGED);
+            supportedLoaders.add(ModLoaderType.NEO_FORGE);
         }
 
         // Sinytra Connector
-        if (analyzer.has(LibraryAnalyzer.LibraryType.NEO_FORGE) && modManager.hasMod("connectormod", ModLoaderType.NEO_FORGED)
+        if (analyzer.has(LibraryAnalyzer.LibraryType.NEO_FORGE) && modManager.hasMod("connectormod", ModLoaderType.NEO_FORGE)
                 || "1.20.1".equals(gameVersion) && analyzer.has(LibraryAnalyzer.LibraryType.FORGE) && modManager.hasMod("connectormod", ModLoaderType.FORGE)) {
             supportedLoaders.add(ModLoaderType.FABRIC);
         }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java
@@ -487,7 +487,7 @@ final class ModInfoDialog extends JFXDialogLayout {
                                         case FORGE -> i18n("install.installer.forge");
                                         case CLEANROOM -> i18n("install.installer.cleanroom");
                                         case LEGACY_FABRIC -> i18n("install.installer.legacyfabric");
-                                        case NEO_FORGED -> i18n("install.installer.neoforge");
+                                        case NEO_FORGE -> i18n("install.installer.neoforge");
                                         case FABRIC -> i18n("install.installer.fabric");
                                         case LITE_LOADER -> i18n("install.installer.liteloader");
                                         case QUILT -> i18n("install.installer.quilt");
@@ -657,7 +657,7 @@ protected void updateControl(ModInfoObject dataItem, boolean empty) {
                     case FORGE -> content.addTagWarning(i18n("install.installer.forge"));
                     case LEGACY_FABRIC -> content.addTagWarning(i18n("install.installer.legacyfabric"));
                     case CLEANROOM -> content.addTagWarning(i18n("install.installer.cleanroom"));
-                    case NEO_FORGED -> content.addTagWarning(i18n("install.installer.neoforge"));
+                    case NEO_FORGE -> content.addTagWarning(i18n("install.installer.neoforge"));
                     case FABRIC -> content.addTagWarning(i18n("install.installer.fabric"));
                     case LITE_LOADER -> content.addTagWarning(i18n("install.installer.liteloader"));
                     case QUILT -> content.addTagWarning(i18n("install.installer.quilt"));
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/download/LibraryAnalyzer.java
@@ -242,7 +242,7 @@ protected boolean matchLibrary(Library library, List<Library> libraries) {
             }
         },
         CLEANROOM(true, "cleanroom", "com\\.cleanroommc", "cleanroom", ModLoaderType.CLEANROOM),
-        NEO_FORGE(true, "neoforge", "net\\.neoforged\\.fancymodloader", "(core|loader)", ModLoaderType.NEO_FORGED) {
+        NEO_FORGE(true, "neoforge", "net\\.neoforged\\.fancymodloader", "(core|loader)", ModLoaderType.NEO_FORGE) {
             private final Pattern NEO_FORGE_VERSION_MATCHER = Pattern.compile("^([0-9.]+)-(?<forge>[0-9.]+)(-([0-9.]+))?$");
 
             @Override
@@ -390,15 +390,15 @@ public LibraryStatus getStatus() {
     public static final String MOD_LAUNCHER_MAIN = "cpw.mods.modlauncher.Launcher";
     public static final String BOOTSTRAP_LAUNCHER_MAIN = "cpw.mods.bootstraplauncher.BootstrapLauncher";
     public static final String FORGE_BOOTSTRAP_MAIN = "net.minecraftforge.bootstrap.ForgeBootstrap";
-    public static final String NEO_FORGED_BOOTSTRAP_MAIN = "net.neoforged.fml.startup.Client";
+    public static final String NEO_FORGE_BOOTSTRAP_MAIN = "net.neoforged.fml.startup.Client";
 
     public static final Set<String> FORGE_OPTIFINE_MAIN = Set.of(
             LibraryAnalyzer.VANILLA_MAIN,
             LibraryAnalyzer.LAUNCH_WRAPPER_MAIN,
             LibraryAnalyzer.MOD_LAUNCHER_MAIN,
             LibraryAnalyzer.BOOTSTRAP_LAUNCHER_MAIN,
             LibraryAnalyzer.FORGE_BOOTSTRAP_MAIN,
-            LibraryAnalyzer.NEO_FORGED_BOOTSTRAP_MAIN
+            LibraryAnalyzer.NEO_FORGE_BOOTSTRAP_MAIN
     );
 
     public static final VersionRange<VersionNumber> FORGE_OPTIFINE_BROKEN_RANGE = VersionNumber.between("48.0.0", "49.0.50");
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModLoaderType.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModLoaderType.java
@@ -21,7 +21,7 @@ public enum ModLoaderType {
     UNKNOWN,
     FORGE,
     CLEANROOM,
-    NEO_FORGED,
+    NEO_FORGE,
     FABRIC,
     QUILT,
     LITE_LOADER,
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModManager.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModManager.java
@@ -47,7 +47,7 @@ private interface ModMetadataReader {
         var map = new HashMap<String, List<Pair<ModMetadataReader, ModLoaderType>>>();
         var zipReaders = List.<Pair<ModMetadataReader, ModLoaderType>>of(
                 pair(ForgeNewModMetadata::fromForgeFile, ModLoaderType.FORGE),
-                pair(ForgeNewModMetadata::fromNeoForgeFile, ModLoaderType.NEO_FORGED),
+                pair(ForgeNewModMetadata::fromNeoForgeFile, ModLoaderType.NEO_FORGE),
                 pair(ForgeOldModMetadata::fromFile, ModLoaderType.FORGE),
                 pair(FabricModMetadata::fromFile, ModLoaderType.FABRIC),
                 pair(QuiltModMetadata::fromFile, ModLoaderType.QUILT),
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/curse/CurseAddon.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/curse/CurseAddon.java
@@ -598,7 +598,7 @@ public RemoteMod.Version toVersion() {
                         if ("fabric".equalsIgnoreCase(version)) return Stream.of(ModLoaderType.FABRIC);
                         else if ("forge".equalsIgnoreCase(version)) return Stream.of(ModLoaderType.FORGE);
                         else if ("quilt".equalsIgnoreCase(version)) return Stream.of(ModLoaderType.QUILT);
-                        else if ("neoforge".equalsIgnoreCase(version)) return Stream.of(ModLoaderType.NEO_FORGED);
+                        else if ("neoforge".equalsIgnoreCase(version)) return Stream.of(ModLoaderType.NEO_FORGE);
                         else return Stream.empty();
                     }).collect(Collectors.toList())
             );
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java
@@ -174,15 +174,15 @@ public static LocalModFile fromForgeFile(ModManager modManager, Path modFile, Zi
     }
 
     public static LocalModFile fromNeoForgeFile(ModManager modManager, Path modFile, ZipFileTree tree) throws IOException {
-        return fromFile(modManager, modFile, tree, ModLoaderType.NEO_FORGED);
+        return fromFile(modManager, modFile, tree, ModLoaderType.NEO_FORGE);
     }
 
     private static LocalModFile fromFile(ModManager modManager, Path modFile, ZipFileTree tree, ModLoaderType modLoaderType) throws IOException {
-        if (modLoaderType != ModLoaderType.FORGE && modLoaderType != ModLoaderType.NEO_FORGED) {
+        if (modLoaderType != ModLoaderType.FORGE && modLoaderType != ModLoaderType.NEO_FORGE) {
             throw new IOException("Invalid mod loader: " + modLoaderType);
         }
 
-        if (modLoaderType == ModLoaderType.NEO_FORGED) {
+        if (modLoaderType == ModLoaderType.NEO_FORGE) {
             try {
                 return fromFile0("META-INF/neoforge.mods.toml", modLoaderType, modManager, modFile, tree);
             } catch (Exception ignored) {
@@ -344,7 +344,7 @@ private static ModLoaderType analyzeLoader(TomlParseResult toml, String modID, M
                     result = ModLoaderType.FORGE;
                     break loop;
                 case "neoforge":
-                    result = ModLoaderType.NEO_FORGED;
+                    result = ModLoaderType.NEO_FORGE;
                     break loop;
             }
         }
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthRemoteModRepository.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthRemoteModRepository.java
@@ -668,7 +668,7 @@ public Optional<RemoteMod.Version> toVersion() {
                     loaders.stream().flatMap(loader -> {
                         if ("fabric".equalsIgnoreCase(loader)) return Stream.of(ModLoaderType.FABRIC);
                         else if ("forge".equalsIgnoreCase(loader)) return Stream.of(ModLoaderType.FORGE);
-                        else if ("neoforge".equalsIgnoreCase(loader)) return Stream.of(ModLoaderType.NEO_FORGED);
+                        else if ("neoforge".equalsIgnoreCase(loader)) return Stream.of(ModLoaderType.NEO_FORGE);
                         else if ("quilt".equalsIgnoreCase(loader)) return Stream.of(ModLoaderType.QUILT);
                         else if ("liteloader".equalsIgnoreCase(loader)) return Stream.of(ModLoaderType.LITE_LOADER);
                         else return Stream.empty();

Original file line number	Diff line number	Diff line change
`@@ -160,11 +160,11 @@ private void updateSupportedLoaders(ModManager modManager) {`
`160`	`160`
`161`	`161`	`if (analyzer.has(LibraryAnalyzer.LibraryType.FABRIC) && modManager.hasMod("kilt", ModLoaderType.FABRIC)) {`
`162`	`162`	`supportedLoaders.add(ModLoaderType.FORGE);`
`163`		`- supportedLoaders.add(ModLoaderType.NEO_FORGED);`
	`163`	`+ supportedLoaders.add(ModLoaderType.NEO_FORGE);`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`// Sinytra Connector`
`167`		`- if (analyzer.has(LibraryAnalyzer.LibraryType.NEO_FORGE) && modManager.hasMod("connectormod", ModLoaderType.NEO_FORGED)`
	`167`	`+ if (analyzer.has(LibraryAnalyzer.LibraryType.NEO_FORGE) && modManager.hasMod("connectormod", ModLoaderType.NEO_FORGE)`
`168`	`168`	`\|\| "1.20.1".equals(gameVersion) && analyzer.has(LibraryAnalyzer.LibraryType.FORGE) && modManager.hasMod("connectormod", ModLoaderType.FORGE)) {`
`169`	`169`	`supportedLoaders.add(ModLoaderType.FABRIC);`
`170`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,15 +174,15 @@ public static LocalModFile fromForgeFile(ModManager modManager, Path modFile, Zi`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`public static LocalModFile fromNeoForgeFile(ModManager modManager, Path modFile, ZipFileTree tree) throws IOException {`
`177`		`- return fromFile(modManager, modFile, tree, ModLoaderType.NEO_FORGED);`
	`177`	`+ return fromFile(modManager, modFile, tree, ModLoaderType.NEO_FORGE);`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`private static LocalModFile fromFile(ModManager modManager, Path modFile, ZipFileTree tree, ModLoaderType modLoaderType) throws IOException {`
`181`		`- if (modLoaderType != ModLoaderType.FORGE && modLoaderType != ModLoaderType.NEO_FORGED) {`
	`181`	`+ if (modLoaderType != ModLoaderType.FORGE && modLoaderType != ModLoaderType.NEO_FORGE) {`
`182`	`182`	`throw new IOException("Invalid mod loader: " + modLoaderType);`
`183`	`183`	`}`
`184`	`184`
`185`		`- if (modLoaderType == ModLoaderType.NEO_FORGED) {`
	`185`	`+ if (modLoaderType == ModLoaderType.NEO_FORGE) {`
`186`	`186`	`try {`
`187`	`187`	`return fromFile0("META-INF/neoforge.mods.toml", modLoaderType, modManager, modFile, tree);`
`188`	`188`	`} catch (Exception ignored) {`
`@@ -344,7 +344,7 @@ private static ModLoaderType analyzeLoader(TomlParseResult toml, String modID, M`
`344`	`344`	`result = ModLoaderType.FORGE;`
`345`	`345`	`break loop;`
`346`	`346`	`case "neoforge":`
`347`		`- result = ModLoaderType.NEO_FORGED;`
	`347`	`+ result = ModLoaderType.NEO_FORGE;`
`348`	`348`	`break loop;`
`349`	`349`	`}`
`350`	`350`	`}`