upstream/FalsePatternLib
2
0 Fork 0
mirror of https://github.com/FalsePattern/FalsePatternLib.git synced 2026-11-11 18:27:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

change dependency logic a bit

Browse Source
This commit is contained in:
FalsePattern committed 2023-01-14 20:46:33 +01:00
1 parent 1c2c3f0cf1
commit f611f252e9
2 files changed
+6 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/falsepattern/lib/internal/impl/dependencies/DependencyLoaderImpl.java
+5 -6
View File
@@ -280,7 +280,6 @@ public class DependencyLoaderImpl {
val dependencySpecs = Stream.of(Launch.classLoader.getSources().stream(),
grabSourceCandidatesFromFolder(modsDir),
grabSourceCandidatesFromFolder(mods1710Dir))
.parallel()
.flatMap((i) -> i)
.flatMap(DependencyLoaderImpl::scanSourceMetaInf)
.map((source) -> {
@@ -312,13 +311,13 @@ public class DependencyLoaderImpl {
mavenRepositories.addAll(dependencySpecs.stream()
.flatMap((dep) -> dep.repositories().stream())
.collect(Collectors.toSet()));
val artifacts = dependencySpecs.parallelStream()
val artifacts = dependencySpecs.stream()
.map((root) -> new Pair<>(root.source(), root.dependencies()))
.flatMap(pair -> flatMap(pair, (dep) -> Stream.of(dep.always(), Share.DEV_ENV ? dep.dev() : dep.obf()).parallel()))
.flatMap(pair -> flatMap(pair, (dep) -> Stream.concat(dep.common().parallelStream(),
.flatMap(pair -> flatMap(pair, (dep) -> Stream.of(dep.always(), Share.DEV_ENV ? dep.dev() : dep.obf())))
.flatMap(pair -> flatMap(pair, (dep) -> Stream.concat(dep.common().stream(),
FMLLaunchHandler.side().isClient() ?
dep.client().parallelStream() :
dep.server().parallelStream()).parallel()))
dep.client().stream() :
dep.server().stream())))
.map((pair) -> {
val source = pair.a;
val dep = pair.b;