Skip to content

Commit f545638

Browse files
committed
Fix prelaunch check
1 parent 18a3fc9 commit f545638

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/main/java/pojlib/API.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.io.IOException;
2323
import java.net.HttpURLConnection;
2424
import java.net.URL;
25+
import java.util.concurrent.ExecutionException;
2526

2627
/**
2728
* This class is the only class used by the launcher to communicate and talk to pojlib. This keeps pojlib and launcher separate.
@@ -177,7 +178,7 @@ public static void prelaunch(Activity activity, MinecraftInstances instances, Mi
177178
if (hasConnection(activity)) {
178179
try {
179180
JREUtils.prelaunchCheck(activity, instance);
180-
} catch (IOException e) {
181+
} catch (IOException | ExecutionException | InterruptedException e) {
181182
Logger.getInstance().appendToLog("WARN! Instance launch failed!" + e);
182183
}
183184
} else {

src/main/java/pojlib/util/JREUtils.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.Arrays;
2525
import java.util.List;
2626
import java.util.Map;
27+
import java.util.concurrent.ExecutionException;
2728

2829
import pojlib.API;
2930

@@ -183,12 +184,12 @@ public static void setJavaEnvironment(Activity activity, MinecraftInstances.Inst
183184
}
184185

185186
// Called before game launch to ensure all files are present and correct
186-
public static void prelaunchCheck(Activity activity, MinecraftInstances.Instance instance) throws IOException {
187+
public static void prelaunchCheck(Activity activity, MinecraftInstances.Instance instance) throws IOException, ExecutionException, InterruptedException {
187188
UnityPlayerActivity.installLWJGL(activity);
188189
Installer.installJVM(activity);
189-
Installer.installClient(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME);
190-
Installer.installLibraries(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME);
191-
Installer.installAssets(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME);
190+
Installer.installClient(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME).get();
191+
Installer.installLibraries(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME).get();
192+
Installer.installAssets(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME).get();
192193
}
193194

194195
public static int launchJavaVM(final Activity activity, final List<String> JVMArgs, MinecraftInstances.Instance instance) throws Throwable {

0 commit comments

Comments
 (0)