Fix: Disambiguate libraries by their module name. #206
Conversation
|
...src/main/java/net/neoforged/fml/loading/moddiscovery/locators/JarInJarDependencyLocator.java
Show resolved
Hide resolved
LlamaLad7
force-pushed
the
fix/library-jij
branch
from
922a225 to
801adda
Compare
|
One question is what should happen when a modid and a module name overlap? Should we add some kind of |
|
Maybe we can do that yeah, just in case. |
LlamaLad7
force-pushed
the
fix/library-jij
branch
from
801adda to
84ba6ac
Compare
|
Ok all done |
That is not true, grouping and selection of the jars, happens solely via the metadata that is included in the json of the containing jar, the identifier information is not actually used for this. What is the current exact problem? |
|
Selection happens solely via this select method: https://github.com/neoforged/JarJar/blob/b9338af0d631251d5ed6779b14c66bd419a2cf37/selector/src/main/java/net/neoforged/jarjar/selection/JarSelector.java#L181-L218 that directly selects via the |
| if (modFile.getModInfos().isEmpty()) { | ||
| // Prefix to ensure this cannot collide with any true mod ID. | ||
| return "library:" + modFile.getModFileInfo().moduleName(); | ||
| } | ||
|
|
||
| return modFile.getModInfos().stream().map(IModInfo::getModId).collect(Collectors.joining()); |
There was a problem hiding this comment.
If we're already fixing up this logic, can we fix this logic here too, by joining them with something that can't be in a mod ID, like + or ,? The current logic would treat a jar containing the mods foo and bar as identical to a jar containing the mod foobar, which it is not.
There was a problem hiding this comment.
The other option is to take just the first mod ID -- which may be more sensible, as that is what becomes the module name. That said -- is there a reason we don't just use the module name in general here? After all, it'll be unique for different mods and for other stuff, but the same between multiple mods that are the "same" mod or whatever.
|
🚀 This PR has been released as FancyModLoader version |
MixinExtras is a library rather than a mod, at the request of the team, but this means that JiJ'ed versions are not correctly grouped since the current logic uses the filename.
This allows users to JiJ new stable versions of mixinextras.
There is another bug with the module name detection for beta versions, but I will fix that separately by setting an
Automatic-Module-Name.