keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Clean up mod dependency checking code (#4922)

This commit is contained in:
Ben Staddon 2018-05-12 20:58:52 +01:00 committed by mezz
parent 33f4acb6b9
commit e65bd4a62b
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/net/minecraftforge/fml/common/Loader.java
View File

@ -252,39 +252,24 @@ public class Loader
wrongMinecraftExceptions.add(ret);
continue;
}
Map<String,ArtifactVersion> names = Maps.uniqueIndex(mod.getRequirements(), ArtifactVersion::getLabel);
Set<String> missingMods = Sets.difference(names.keySet(), modVersions.keySet());
if (!missingMods.isEmpty())
{
MissingModsException missingModsException = new MissingModsException(mod.getModId(), mod.getName());
FMLLog.log.fatal("The mod {} ({}) requires mods {} to be available", mod.getModId(), mod.getName(), missingMods);
for (String modid : missingMods)
{
ArtifactVersion acceptedVersion = names.get(modid);
ArtifactVersion currentVersion = modVersions.get(modid);
boolean required = mod.getRequirements().contains(acceptedVersion);
missingModsException.addMissingMod(acceptedVersion, currentVersion, required);
}
FMLLog.log.fatal(missingModsException.getMessage());
missingModsExceptions.add(missingModsException);
continue;
}
reqList.putAll(mod.getModId(), names.keySet());
ImmutableList<ArtifactVersion> allDeps = ImmutableList.<ArtifactVersion>builder()
.addAll(mod.getDependants())
.addAll(mod.getDependencies())
.addAll(mod.getRequirements())
.build();
reqList.putAll(mod.getModId(), Iterables.transform(mod.getRequirements(), ArtifactVersion::getLabel));
Set<ArtifactVersion> allDeps = Sets.newHashSet();
allDeps.addAll(mod.getDependants());
allDeps.addAll(mod.getDependencies());
allDeps.addAll(mod.getRequirements());
MissingModsException missingModsException = new MissingModsException(mod.getModId(), mod.getName());
for (ArtifactVersion acceptedVersion : allDeps)
{
if (modVersions.containsKey(acceptedVersion.getLabel()))
boolean required = mod.getRequirements().contains(acceptedVersion);
if (required || modVersions.containsKey(acceptedVersion.getLabel()))
{
ArtifactVersion currentVersion = modVersions.get(acceptedVersion.getLabel());
if (!acceptedVersion.containsVersion(currentVersion))
if (currentVersion == null || !acceptedVersion.containsVersion(currentVersion))
{
boolean required = mod.getRequirements().contains(acceptedVersion);
missingModsException.addMissingMod(acceptedVersion, currentVersion, required);
}
}