Fix: Disambiguate libraries by their module name.

neoforged · Oct 23, 2024 · 801adda · 801adda
1 parent cf7f3db
commit 801adda
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.../main/java/net/neoforged/fml/loading/moddiscovery/locators/JarInJarDependencyLocator.java b/.../main/java/net/neoforged/fml/loading/moddiscovery/locators/JarInJarDependencyLocator.java
@@ -109,9 +109,13 @@ private String formatError(final ModWithVersionRange modWithVersionRange) {
     }
 
     protected String identifyMod(final IModFile modFile) {
-        if (modFile.getModFileInfo() == null || modFile.getModInfos().isEmpty()) {
+        if (modFile.getModFileInfo() == null) {
             return modFile.getFileName();
         }
+        // If this is a library, it won't have any mod IDs, so we use the module name instead.
+        if (modFile.getModInfos().isEmpty()) {
+            return modFile.getModFileInfo().moduleName();
+        }
 
         return modFile.getModInfos().stream().map(IModInfo::getModId).collect(Collectors.joining());
     }

diff --git a/...main/java/net/neoforged/fml/loading/moddiscovery/readers/JarModsDotTomlModFileReader.java b/...main/java/net/neoforged/fml/loading/moddiscovery/readers/JarModsDotTomlModFileReader.java
@@ -140,12 +140,12 @@ public IConfigurable getConfig() {
             return configurable;
         }
 
-        // These Should never be called as it's only called from ModJarMetadata.version and we bypass that
         @Override
         public String moduleName() {
             return mod.getSecureJar().name();
         }
 
+        // These Should never be called as it's only called from ModJarMetadata.version and we bypass that
         @Override
         public String versionString() {
             return null;