TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-15 23:59:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use ClassWrapper if main class is LaunchWrapper; Fix input event crash

Browse Source
This commit is contained in:
khanhduytran0 2020-10-06 17:18:50 +07:00
parent 2cbcd6179b
commit a5742b0760
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/net/kdt/pojavlaunch/Tools.java
View File

@ -105,9 +105,15 @@ public final class Tools
getJavaArgs(ctx, javaArgList); getJavaArgs(ctx, javaArgList);
javaArgList.add("-cp"); javaArgList.add("-cp");
javaArgList.add(Tools.MAIN_PATH + "/lwjgl3/ClassWrapper.jar"); if (versionInfo.mainClass.equals("net.minecraft.launchwrapper.Launch")) {
javaArgList.add("ClassWrapper"); // Also preload LWJGL3 to fix crash on send input events
javaArgList.add(launchClassPath); javaArgList.add(Tools.MAIN_PATH + "/lwjgl3/ClassWrapper.jar:" + getLWJGL3ClassPath());
javaArgList.add("ClassWrapper");
javaArgList.add(launchClassPath);
} else {
javaArgList.add(getLWJGL3ClassPath() + ":" + launchClassPath);
}
javaArgList.add(versionInfo.mainClass); javaArgList.add(versionInfo.mainClass);
javaArgList.addAll(Arrays.asList(launchArgs)); javaArgList.addAll(Arrays.asList(launchArgs));
/* /*
@ -335,9 +341,23 @@ public final class Tools
return versnDir + "/" + version + "/" + version + ".jar"; return versnDir + "/" + version + "/" + version + ".jar";
} }
private static String getLWJGL3ClassPath() {
StringBuilder libStr = new StringBuilder();
File lwjgl3Folder = new File(Tools.MAIN_PATH, "lwjgl3");
if (/* info.arguments != null && */ lwjgl3Folder.exists()) {
for (File file: lwjgl3Folder.listFiles()) {
if (file.getName().endsWith(".jar")) {
libStr.append(file.getAbsolutePath() + ":");
}
}
}
// Remove the ':' at the end
libStr.setLength(libStr.length() - 1);
return libStr.toString();
}
private static boolean isClientFirst = false; private static boolean isClientFirst = false;
public static String generateLaunchClassPath(String version) throws IOException public static String generateLaunchClassPath(String version) {
{
StringBuilder libStr = new StringBuilder(); //versnDir + "/" + version + "/" + version + ".jar:"; StringBuilder libStr = new StringBuilder(); //versnDir + "/" + version + "/" + version + ".jar:";
JMinecraftVersionList.Version info = getVersionInfo(version); JMinecraftVersionList.Version info = getVersionInfo(version);
@ -345,20 +365,23 @@ public final class Tools
// Debug: LWJGL 3 override // Debug: LWJGL 3 override
// File lwjgl2Folder = new File(Tools.MAIN_PATH, "lwjgl2"); // File lwjgl2Folder = new File(Tools.MAIN_PATH, "lwjgl2");
/*
File lwjgl3Folder = new File(Tools.MAIN_PATH, "lwjgl3"); File lwjgl3Folder = new File(Tools.MAIN_PATH, "lwjgl3");
if (/* info.arguments != null && */ lwjgl3Folder.exists()) { if (lwjgl3Folder.exists()) {
for (File file: lwjgl3Folder.listFiles()) { for (File file: lwjgl3Folder.listFiles()) {
if (file.getName().endsWith(".jar")) { if (file.getName().endsWith(".jar")) {
libStr.append(file.getAbsolutePath() + ":"); libStr.append(file.getAbsolutePath() + ":");
} }
} }
} /* else if (lwjgl2Folder.exists()) { } else if (lwjgl2Folder.exists()) {
for (File file: lwjgl2Folder.listFiles()) { for (File file: lwjgl2Folder.listFiles()) {
if (file.getName().endsWith(".jar")) { if (file.getName().endsWith(".jar")) {
libStr.append(file.getAbsolutePath() + ":"); libStr.append(file.getAbsolutePath() + ":");
} }
} }
} */ }
*/
if (isClientFirst) { if (isClientFirst) {
libStr.append(getPatchedFile(version)); libStr.append(getPatchedFile(version));