Skip to content

Commit f611f25

Browse files
committed
change dependency logic a bit
1 parent 1c2c3f0 commit f611f25

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/main/java/com/falsepattern/lib/internal/impl/dependencies/DependencyLoaderImpl.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,6 @@ public static void scanDeps() {
280280
val dependencySpecs = Stream.of(Launch.classLoader.getSources().stream(),
281281
grabSourceCandidatesFromFolder(modsDir),
282282
grabSourceCandidatesFromFolder(mods1710Dir))
283-
.parallel()
284283
.flatMap((i) -> i)
285284
.flatMap(DependencyLoaderImpl::scanSourceMetaInf)
286285
.map((source) -> {
@@ -312,13 +311,13 @@ public static void scanDeps() {
312311
mavenRepositories.addAll(dependencySpecs.stream()
313312
.flatMap((dep) -> dep.repositories().stream())
314313
.collect(Collectors.toSet()));
315-
val artifacts = dependencySpecs.parallelStream()
314+
val artifacts = dependencySpecs.stream()
316315
.map((root) -> new Pair<>(root.source(), root.dependencies()))
317-
.flatMap(pair -> flatMap(pair, (dep) -> Stream.of(dep.always(), Share.DEV_ENV ? dep.dev() : dep.obf()).parallel()))
318-
.flatMap(pair -> flatMap(pair, (dep) -> Stream.concat(dep.common().parallelStream(),
316+
.flatMap(pair -> flatMap(pair, (dep) -> Stream.of(dep.always(), Share.DEV_ENV ? dep.dev() : dep.obf())))
317+
.flatMap(pair -> flatMap(pair, (dep) -> Stream.concat(dep.common().stream(),
319318
FMLLaunchHandler.side().isClient() ?
320-
dep.client().parallelStream() :
321-
dep.server().parallelStream()).parallel()))
319+
dep.client().stream() :
320+
dep.server().stream())))
322321
.map((pair) -> {
323322
val source = pair.a;
324323
val dep = pair.b;

src/main/resources/DEPENDENCIES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FalsePatternLib JSON dependency file example
22
Version 1
33

44
An example JSON file that can be used to download dependencies using FalsePatternLib. This replaces the legacy
5-
DependencyLoader api.
5+
DependencyLoader api. This file needs to reside inside the META-INF directory.
66
```json
77
{
88
"identifier": "falsepatternlib_dependencies",

0 commit comments

Comments
 (0)