Kotori0629/Arclight1.18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bukkit library loader not working (#443)

Browse Source
This commit is contained in:
IzzelAliz 2022-01-27 14:29:46 +08:00
parent 408a327d2d
commit b78d3af448
No known key found for this signature in database
GPG Key ID: EE50E123A11D8338
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java
View File

@ -264,7 +264,7 @@ public class ForgeInstaller {
if (split[0].equals("legacyClassPath")) { if (split[0].equals("legacyClassPath")) {
split[1] = split[1] =
Stream.concat( Stream.concat(
Stream.concat(Stream.of(self.toString(), split[1]), installInfo.libraries.keySet().stream() Stream.concat(Stream.concat(Stream.of(self.toString()), Arrays.stream(split[1].split(File.pathSeparator))), installInfo.libraries.keySet().stream()
.map(it -> Paths.get("libraries", Util.mavenToPath(it))) .map(it -> Paths.get("libraries", Util.mavenToPath(it)))
.peek(it -> { .peek(it -> {
var name = it.getFileName().toString(); var name = it.getFileName().toString();
@ -275,7 +275,16 @@ public class ForgeInstaller {
.map(Path::toString)), .map(Path::toString)),
Stream.empty() Stream.empty()
//Stream.of(self) //Stream.of(self)
).collect(Collectors.joining(File.pathSeparator)); ).sorted((a, b) -> {
// damn stupid jpms
if (a.contains("maven-repository-metadata")) {
return -1;
} else if (b.contains("maven-repository-metadata")) {
return 1;
} else {
return 0;
}
}).collect(Collectors.joining(File.pathSeparator));
} else if (split[0].equals("ignoreList")) { } else if (split[0].equals("ignoreList")) {
ignores.addAll(Arrays.asList(split[1].split(","))); ignores.addAll(Arrays.asList(split[1].split(",")));
} }