mirrors/Terra
1
0 Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-10-25 21:40:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

reimplement strata

Browse Source
This commit is contained in:
dfsek committed 2021-11-28 13:09:30 -07:00
1 parent 2325886adb
commit 6f88519df8
3 files changed
+6 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

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