Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-31 20:59:54 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] makeprofile fabric fix

Browse source
This commit is contained in:
Gravita 2021-07-11 23:33:31 +07:00
parent 1912393a40
commit 30ec6409fd
1 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
LaunchServer/src/main/java/pro/gravit/launchserver/helper/MakeProfileHelper.java
View file

@ -49,6 +49,7 @@ public static ClientProfile makeProfile(ClientProfile.Version version, String ti
jvmArgs.add("-XX:G1HeapRegionSize=32M"); jvmArgs.add("-XX:G1HeapRegionSize=32M");
// ----------- // -----------
Optional<MakeProfileOptionForge> forge = findOption(options, MakeProfileOptionForge.class); Optional<MakeProfileOptionForge> forge = findOption(options, MakeProfileOptionForge.class);
Optional<MakeProfileOptionFabric> fabric = findOption(options, MakeProfileOptionFabric.class);
if (version.compareTo(ClientProfile.Version.MC1122) > 0) { if (version.compareTo(ClientProfile.Version.MC1122) > 0) {
jvmArgs.add("-Djava.library.path=natives"); jvmArgs.add("-Djava.library.path=natives");
OptionalFile optionalMacOs = new OptionalFile(); OptionalFile optionalMacOs = new OptionalFile();
@ -59,6 +60,9 @@ public static ClientProfile makeProfile(ClientProfile.Version version, String ti
optionalMacOs.triggersList = List.of(new OSTrigger(JVMHelper.OS.MACOSX)); optionalMacOs.triggersList = List.of(new OSTrigger(JVMHelper.OS.MACOSX));
optionals.add(optionalMacOs); optionals.add(optionalMacOs);
} }
if (fabric.isPresent()) {
builder.setAltClassPath(fabric.orElseThrow().getAltClassPath());
}
if (findOption(options, MakeProfileOptionLwjgl.class).isPresent()) { if (findOption(options, MakeProfileOptionLwjgl.class).isPresent()) {
OptionalFile optionalMac = new OptionalFile(); OptionalFile optionalMac = new OptionalFile();
optionalMac.name = "MacLwjgl"; optionalMac.name = "MacLwjgl";
@ -163,7 +167,7 @@ public static MakeProfileOption[] getMakeProfileOptionsFromDir(Path dir, ClientP
options.add(new MakeProfileOptionForge(dir)); options.add(new MakeProfileOptionForge(dir));
} }
if (Files.exists(dir.resolve("libraries/net/fabricmc/fabric-loader"))) { if (Files.exists(dir.resolve("libraries/net/fabricmc/fabric-loader"))) {
options.add(new MakeProfileOptionFabric()); options.add(new MakeProfileOptionFabric(dir));
} }
} }
if (Files.exists(dir.resolve("liteloader.jar"))) { if (Files.exists(dir.resolve("liteloader.jar"))) {
@ -232,12 +236,37 @@ private static Path findFirstDir(Path path) throws IOException {
return Files.list(path).findFirst().orElse(null); return Files.list(path).findFirst().orElse(null);
} }
private static Path findFirstMavenFile(Path path) throws IOException {
return Files.list(Files.list(path).findFirst().orElseThrow()).filter(e -> e.getFileName().toString().endsWith(".jar")).findFirst().orElseThrow();
}
public static class MakeProfileOptionLaunchWrapper implements MakeProfileOption { public static class MakeProfileOptionLaunchWrapper implements MakeProfileOption {
} }
public static class MakeProfileOptionFabric implements MakeProfileOption { public static class MakeProfileOptionFabric implements MakeProfileOption {
public String jimfsPath;
public String guavaPath;
public List<String> getAltClassPath() {
if (jimfsPath == null || guavaPath == null) return List.of();
return List.of(jimfsPath, guavaPath);
}
public MakeProfileOptionFabric() {
}
public MakeProfileOptionFabric(String jimfsPath, String guavaPath) {
this.jimfsPath = jimfsPath;
this.guavaPath = guavaPath;
}
public MakeProfileOptionFabric(Path clientDir) throws IOException {
if (Files.exists(clientDir.resolve("libraries/com/google/jimfs/jimfs"))) {
jimfsPath = clientDir.relativize(findFirstMavenFile(clientDir.resolve("libraries/com/google/jimfs/jimfs"))).toString();
guavaPath = clientDir.relativize(findFirstMavenFile(clientDir.resolve("libraries/com/google/guava/guava/"))).toString();
}
}
} }
public static class MakeProfileOptionLiteLoader implements MakeProfileOption { public static class MakeProfileOptionLiteLoader implements MakeProfileOption {