Skip to content

Commit 53f2dc9

Browse files
committed
Fixed an issue maybe?
1 parent d389952 commit 53f2dc9

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

src/main/java/org/mangorage/bootstrap/internal/launch/MangoBotDependencyLocator.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.mangorage.bootstrap.api.dependency.IDependency;
44
import org.mangorage.bootstrap.api.dependency.IDependencyLocator;
55
import org.mangorage.bootstrap.internal.DependencyHandler;
6+
67
import java.nio.file.Path;
78
import java.util.List;
89

src/main/java/org/mangorage/bootstrap/internal/launch/MangoBotLaunchTarget.java

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
import org.mangorage.bootstrap.api.dependency.IDependencyLocator;
55
import org.mangorage.bootstrap.api.launch.ILaunchTarget;
66
import org.mangorage.bootstrap.api.launch.ILaunchTargetEntrypoint;
7-
import org.mangorage.bootstrap.internal.DependencyHandler;
87
import org.mangorage.bootstrap.internal.util.Util;
9-
import org.mangorage.bootstrap.internal.util.Result;
108

119
import java.io.IOException;
1210
import java.lang.module.Configuration;
@@ -23,8 +21,6 @@
2321
import java.util.ServiceLoader;
2422
import java.util.Set;
2523

26-
import static org.mangorage.bootstrap.internal.util.Util.callMain;
27-
2824
public final class MangoBotLaunchTarget implements ILaunchTarget {
2925

3026
/**
@@ -75,13 +71,10 @@ public String getId() {
7571
public void launch(ModuleLayer parent, String[] args) throws Throwable {
7672
final var pluginsPath = Path.of("plugins");
7773

78-
List<IDependencyLocator> dependencyLocators = new ArrayList<>();
79-
dependencyLocators.add(new MangoBotDependencyLocator());
80-
81-
// ServiceLoader.load(IDependencyLocator.class)
82-
// .stream()
83-
// .map(ServiceLoader.Provider::get)
84-
// .toList();
74+
List<IDependencyLocator> dependencyLocators = ServiceLoader.load(IDependencyLocator.class)
75+
.stream()
76+
.map(ServiceLoader.Provider::get)
77+
.toList();
8578

8679
final Map<String, List<IDependency>> dependencies = new HashMap<>();
8780

@@ -123,7 +116,8 @@ public void launch(ModuleLayer parent, String[] args) throws Throwable {
123116

124117
final var moduleCfg = Configuration.resolve(
125118
ModuleFinder.of(
126-
finalDependencies.values().stream()
119+
finalDependencies.values()
120+
.stream()
127121
.map(IDependency::resolveJar)
128122
.toArray(Path[]::new)
129123
),

0 commit comments

Comments
 (0)