From d3f08a850950c8f304d06bce85e47edec8ed1794 Mon Sep 17 00:00:00 2001 From: Calboot Date: Tue, 31 Mar 2026 21:55:08 +0800 Subject: [PATCH 1/4] Fix #5329 --- .../org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 5e14f90262..f7b471ec43 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java @@ -181,13 +181,13 @@ private static LocalModFile fromFile(ModManager modManager, Path modFile, ZipFil if (modLoaderType == ModLoaderType.NEO_FORGED) { try { - return fromFile0("META-INF/neoforge.mods.toml", modLoaderType, modManager, modFile, tree); + return fromFile0("META-INF/neoforge.mods.toml", ModLoaderType.NEO_FORGED, modManager, modFile, tree); } catch (Exception ignored) { } } try { - return fromFile0("META-INF/mods.toml", modLoaderType, modManager, modFile, tree); + return fromFile0("META-INF/mods.toml", ModLoaderType.FORGE, modManager, modFile, tree); } catch (Exception ignored) { } From 3a90dd0e1a1e2301f27d44429d08ca12daadc438 Mon Sep 17 00:00:00 2001 From: Calboot Date: Wed, 1 Apr 2026 21:43:34 +0800 Subject: [PATCH 2/4] reverse --- .../org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index f7b471ec43..5e14f90262 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java @@ -181,13 +181,13 @@ private static LocalModFile fromFile(ModManager modManager, Path modFile, ZipFil if (modLoaderType == ModLoaderType.NEO_FORGED) { try { - return fromFile0("META-INF/neoforge.mods.toml", ModLoaderType.NEO_FORGED, modManager, modFile, tree); + return fromFile0("META-INF/neoforge.mods.toml", modLoaderType, modManager, modFile, tree); } catch (Exception ignored) { } } try { - return fromFile0("META-INF/mods.toml", ModLoaderType.FORGE, modManager, modFile, tree); + return fromFile0("META-INF/mods.toml", modLoaderType, modManager, modFile, tree); } catch (Exception ignored) { } From 9c828c56d82bbe12b107589af11ce9e01af78c8e Mon Sep 17 00:00:00 2001 From: Calboot Date: Wed, 1 Apr 2026 21:47:51 +0800 Subject: [PATCH 3/4] fix --- .../jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 index 5e14f90262..6001981032 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java @@ -293,7 +293,7 @@ private static LocalModFile fromEmbeddedMod(ModManager modManager, Path modFile, throw new IOException(); } - private static ModLoaderType analyzeLoader(Toml toml, String modID, ModLoaderType loader) throws IOException { + private static ModLoaderType analyzeLoader(Toml toml, String modID, ModLoaderType loader) { List> dependencies = null; try { dependencies = toml.getList("dependencies." + modID); @@ -332,11 +332,10 @@ private static ModLoaderType analyzeLoader(Toml toml, String modID, ModLoaderTyp } } - if (result == loader) + if (result != null) { + if (result != loader) LOG.warning("Loader mismatch for mod " + modID + ", found " + result + ", expecting " + loader); return result; - else if (result != null) - throw new IOException("Loader mismatch"); - else { + } else { LOG.warning("Cannot determine the mod loader for mod " + modID + ", expected " + loader); return loader; } From 3aad80d6a694c8df9a8125361e869bad64595a08 Mon Sep 17 00:00:00 2001 From: Glavo Date: Sat, 4 Apr 2026 20:55:22 +0800 Subject: [PATCH 4/4] update --- .../org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 index 6001981032..566ac2aeb4 100644 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java +++ b/HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modinfo/ForgeNewModMetadata.java @@ -333,7 +333,8 @@ private static ModLoaderType analyzeLoader(Toml toml, String modID, ModLoaderTyp } if (result != null) { - if (result != loader) LOG.warning("Loader mismatch for mod " + modID + ", found " + result + ", expecting " + loader); + if (result != loader) + LOG.warning("Loader mismatch for mod " + modID + ", found " + result + ", expecting " + loader); return result; } else { LOG.warning("Cannot determine the mod loader for mod " + modID + ", expected " + loader);