mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2025-07-04 00:45:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix missing dep error message

Browse Source
This commit is contained in:
dfsek 2022-01-18 21:30:45 -07:00
parent aa605b7402
commit cc769fa871
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/implementation/base/src/main/java/com/dfsek/terra/addon/DependencySorter.java
View File

@ -42,12 +42,7 @@ public class DependencySorter {
private void sortDependencies(BaseAddon addon, List<BaseAddon> sort) { private void sortDependencies(BaseAddon addon, List<BaseAddon> sort) {
addon.getDependencies().forEach((id, range) -> { addon.getDependencies().forEach((id, range) -> {
if(!addons.containsKey(id)) { BaseAddon dependency = get(id, addon);
throw new DependencyException("Addon " + addon.getID() + " specifies dependency on " + id + ", versions " + range +
", but no such addon is installed.");
}
BaseAddon dependency = addons.get(id);
if(!range.isSatisfiedBy(dependency.getVersion())) { if(!range.isSatisfiedBy(dependency.getVersion())) {
throw new DependencyVersionException( throw new DependencyVersionException(
@ -65,9 +60,17 @@ public class DependencySorter {
}); });
} }
private BaseAddon get(String id, BaseAddon addon) {
if(!addons.containsKey(id)) {
throw new DependencyException("Addon " + addon.getID() + " specifies dependency on " + id + ", versions " + addon.getDependencies().get(id).getFormatted() +
", but no such addon is installed.");
}
return addons.get(id);
}
private void checkDependencies(BaseAddon base, BaseAddon current) { private void checkDependencies(BaseAddon base, BaseAddon current) {
current.getDependencies().forEach((id, range) -> { current.getDependencies().forEach((id, range) -> {
BaseAddon dependency = addons.get(id); BaseAddon dependency = get(id, current);
if(dependency.getID().equals(base.getID())) { if(dependency.getID().equals(base.getID())) {
throw new CircularDependencyException( throw new CircularDependencyException(
"Addon " + base.getID() + " has circular dependency beginning with " + dependency.getID()); "Addon " + base.getID() + " has circular dependency beginning with " + dependency.getID());