Better descriptions on dependency version range error screen (#4284)

This commit is contained in:
tterrag authored and LexManos committed 2017-08-09 15:10:54 -05:00
1 parent b918d3551e
commit ce168d556d
2 files changed
+22 -3

No files matched your search

@@ -215,10 +215,25 @@ public class Restriction
if ( getLowerBound().getVersionString().equals(getUpperBound().getVersionString()) )
{
return getLowerBound().getVersionString();
}
else
}
else
{
return I18n.format("fml.messages.version.restriction.bounded", getLowerBound(), getUpperBound());
if (isLowerBoundInclusive() && isUpperBoundInclusive())
{
return I18n.format("fml.messages.version.restriction.bounded.inclusive", getLowerBound(), getUpperBound());
}
else if (isLowerBoundInclusive())
{
return I18n.format("fml.messages.version.restriction.bounded.upperexclusive", getLowerBound(), getUpperBound());
}
else if (isUpperBoundInclusive())
{
return I18n.format("fml.messages.version.restriction.bounded.lowerexclusive", getLowerBound(), getUpperBound());
}
else
{
return I18n.format("fml.messages.version.restriction.bounded.exclusive", getLowerBound(), getUpperBound());
}
}
}
else if ( getLowerBound() != null )
@@ -181,6 +181,10 @@ fml.messages.version.restriction.lower.exclusive=above %s
fml.messages.version.restriction.upper.inclusive=%s or below
fml.messages.version.restriction.upper.exclusive=below %s
fml.messages.version.restriction.bounded=between %s and %s
fml.messages.version.restriction.bounded.inclusive=between %s and %s (inclusive)
fml.messages.version.restriction.bounded.exclusive=between %s and %s (exclusive)
fml.messages.version.restriction.bounded.lowerexclusive=above %s, and %s or below
fml.messages.version.restriction.bounded.upperexclusive=%s or above, and below %s
fml.button.continue=Continue
fml.button.open.mods.folder=Open Mods Folder