diff --git a/common/api/addons/build.gradle.kts b/common/api/addons/build.gradle.kts index 3ffdc275d..87ca3b8ec 100644 --- a/common/api/addons/build.gradle.kts +++ b/common/api/addons/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { shadedApi(project(":common:api:util")) - shadedApi("ca.solo-studios:strata:1.0.0") + shadedApi("ca.solo-studios:strata:1.1.1") } diff --git a/common/api/core/build.gradle.kts b/common/api/core/build.gradle.kts index 70bc570dd..2a27dfd64 100644 --- a/common/api/core/build.gradle.kts +++ b/common/api/core/build.gradle.kts @@ -11,7 +11,5 @@ dependencies { shadedApi("net.jafama:jafama:2.3.2") shadedApi("org.slf4j:slf4j-api:1.7.32") - - shadedApi("ca.solo-studios:strata:1.0.0") } diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/addon/DependencySorter.java b/common/implementation/base/src/main/java/com/dfsek/terra/addon/DependencySorter.java index c4402b602..95dbb4ed9 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/addon/DependencySorter.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/addon/DependencySorter.java @@ -50,9 +50,9 @@ public class DependencySorter { BaseAddon dependency = addons.get(id); if(!range.isSatisfiedBy(dependency.getVersion())) { - // FIXME - Strata is currently broken. - //throw new DependencyVersionException("Addon " + addon.getID() + " specifies dependency on " + id + ", versions " + range + - // ", but non-matching version " + dependency.getVersion().getFormatted() + " is installed.."); + throw new DependencyVersionException( + "Addon " + addon.getID() + " specifies dependency on " + id + ", versions " + range.getFormatted() + + ", but non-matching version " + dependency.getVersion().getFormatted() + " is installed."); } if(!visited.get(dependency.getID())) { // if we've not visited it yet @@ -75,6 +75,7 @@ public class DependencySorter { checkDependencies(base, dependency); }); } + public List sort() { List sorted = new ArrayList<>(); @@ -88,7 +89,7 @@ public class DependencySorter { if(!visited.get(addon.getID())) { sortDependencies(addon, sorted); } - + if(!visited.get(addon.getID())) { sorted.add(addon); visited.put(addon.getID(), true);