TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-13 06:39:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
khanhduytran0 2020-08-24 16:10:03 +07:00
commit 61d2b4bd00
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View File

@ -125,6 +125,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
private static final int LTYPE_INVOCATION = 0; private static final int LTYPE_INVOCATION = 0;
private static final int LTYPE_PROCESS = 1; private static final int LTYPE_PROCESS = 1;
private final int LAUNCH_TYPE = LTYPE_PROCESS; private final int LAUNCH_TYPE = LTYPE_PROCESS;
// LTYPE_INVOCATION;
// private static Collection<? extends Provider.Service> rsaPkcs1List; // private static Collection<? extends Provider.Service> rsaPkcs1List;
@ -923,7 +924,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
List<String> minecraftArgs = new ArrayList<String>(); List<String> minecraftArgs = new ArrayList<String>();
if (mVersionInfo.arguments != null) { if (mVersionInfo.arguments != null) {
// Support Minecraft 1.13 // Support Minecraft 1.13+
for (Object arg : mVersionInfo.arguments.game) { for (Object arg : mVersionInfo.arguments.game) {
if (arg instanceof String) { if (arg instanceof String) {
minecraftArgs.add((String) arg); minecraftArgs.add((String) arg);
@ -1019,6 +1020,10 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
javaArgList.add("-Dorg.lwjgl.util.DebugFunctions=true"); javaArgList.add("-Dorg.lwjgl.util.DebugFunctions=true");
javaArgList.add("-Dorg.lwjgl.util.DebugLoader=true"); javaArgList.add("-Dorg.lwjgl.util.DebugLoader=true");
// GLFW Stub width height
javaArgList.add("-Dglfwstub.windowWidth=" + AndroidDisplay.windowWidth);
javaArgList.add("-Dglfwstub.windowHeight=" + AndroidDisplay.windowHeight);
javaArgList.add("-cp"); javaArgList.add("-cp");
javaArgList.add(Tools.generateLaunchClassPath(mProfile.getVersion())); javaArgList.add(Tools.generateLaunchClassPath(mProfile.getVersion()));
javaArgList.add(mVersionInfo.mainClass); javaArgList.add(mVersionInfo.mainClass);
@ -1050,7 +1055,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
if (exitCode != 0) { if (exitCode != 0) {
Tools.showError(this, new ErrnoException("java", exitCode), false); Tools.showError(this, new ErrnoException("java", exitCode), false);
} }
} else { } else { // Type Invocation
final FileDescriptor logFile = BinaryExecutor.redirectStdio(); final FileDescriptor logFile = BinaryExecutor.redirectStdio();
new Thread(new Runnable() { new Thread(new Runnable() {