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

Fix up incorrect dependency handling

Browse source
This commit is contained in:
Christian Weeks 2012-05-12 02:10:50 -04:00
parent ff26096a0f
commit b26b3fda1b
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java
View file

@ -484,6 +484,7 @@ public class ModLoaderModContainer implements ModContainer
return;
}
boolean parseFailure=false;
StringTokenizer st = new StringTokenizer(mod.getPriorities(), ";");
for (; st.hasMoreTokens();)
@ -493,24 +494,29 @@ public class ModLoaderModContainer implements ModContainer
if (depparts.length < 2)
{
throw new LoaderException();
parseFailure=true;
}
if ("required-before".equals(depparts[0]) || "required-after".equals(depparts[0]))
else if ("required-before".equals(depparts[0]) || "required-after".equals(depparts[0]))
{
dependencies.add(depparts[1]);
if (!depparts[1].trim().equals("*")) {
dependencies.add(depparts[1]);
} else {
parseFailure=true;
}
}
if ("required-before".equals(depparts[0]) || "before".equals(depparts[0]))
else if ("required-before".equals(depparts[0]) || "before".equals(depparts[0]))
{
postDependencies.add(depparts[1]);
}
if ("required-after".equals(depparts[0]) || "after".equals(depparts[0]))
} else if ("required-after".equals(depparts[0]) || "after".equals(depparts[0]))
{
preDependencies.add(depparts[1]);
} else {
parseFailure=true;
}
}
if (parseFailure) {
FMLCommonHandler.instance().getFMLLogger().warning(String.format("The mod %s has an incorrect dependency string {%s}", mod.getPriorities()));
}
}