Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-11-15 11:39:11 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Хак для Forge

Browse source
This commit is contained in:
Gravit 2019-12-13 09:37:42 +07:00
parent 4dcc1443f6
commit a259527a20
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Launcher/src/main/java/pro/gravit/launcher/client/ClientLauncher.java
View file

@ -299,7 +299,12 @@ private static void launch(ClientProfile profile, Params params) throws Throwabl
Launcher.LAUNCHED.set(true); Launcher.LAUNCHED.set(true);
JVMHelper.fullGC(); JVMHelper.fullGC();
// Invoke main method // Invoke main method
try {
mainMethod.invokeWithArguments((Object) args.toArray(new String[0])); mainMethod.invokeWithArguments((Object) args.toArray(new String[0]));
} finally {
Request.service.close();
}
} }
private static Process process = null; private static Process process = null;
@ -501,7 +506,7 @@ public static void main(String... args) throws Throwable {
ClientService.classLoader = classLoader; ClientService.classLoader = classLoader;
classLoader.addURL(IOHelper.getCodeSource(ClientLauncher.class).toUri().toURL()); classLoader.addURL(IOHelper.getCodeSource(ClientLauncher.class).toUri().toURL());
//classForName(classLoader, "com.google.common.collect.ForwardingMultimap"); //classForName(classLoader, "com.google.common.collect.ForwardingMultimap");
ClientService.baseURLs = classpath; ClientService.baseURLs = classLoader.getURLs();
LogHelper.debug("Starting JVM and client WatchService"); LogHelper.debug("Starting JVM and client WatchService");
FileNameMatcher assetMatcher = profile.getAssetUpdateMatcher(); FileNameMatcher assetMatcher = profile.getAssetUpdateMatcher();
FileNameMatcher clientMatcher = profile.getClientUpdateMatcher(); FileNameMatcher clientMatcher = profile.getClientUpdateMatcher();

2
LauncherAPI/src/main/java/pro/gravit/launcher/request/websockets/ClientJSONPoint.java
View file

@ -108,7 +108,7 @@ public void close() throws InterruptedException {
ch.closeFuture().sync(); ch.closeFuture().sync();
} }
//group.shutdownGracefully(); group.shutdownGracefully();
} }
public void eval(final String text) { public void eval(final String text) {