mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-11 13:45:48 -04:00
Merge
This commit is contained in:
commit
61d2b4bd00
@ -125,7 +125,8 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
|
||||
private static final int LTYPE_INVOCATION = 0;
|
||||
private static final int LTYPE_PROCESS = 1;
|
||||
private final int LAUNCH_TYPE = LTYPE_PROCESS;
|
||||
|
||||
// LTYPE_INVOCATION;
|
||||
|
||||
// private static Collection<? extends Provider.Service> rsaPkcs1List;
|
||||
|
||||
private String getStr(int id) {
|
||||
@ -923,7 +924,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
|
||||
|
||||
List<String> minecraftArgs = new ArrayList<String>();
|
||||
if (mVersionInfo.arguments != null) {
|
||||
// Support Minecraft 1.13
|
||||
// Support Minecraft 1.13+
|
||||
for (Object arg : mVersionInfo.arguments.game) {
|
||||
if (arg instanceof String) {
|
||||
minecraftArgs.add((String) arg);
|
||||
@ -1018,6 +1019,10 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
|
||||
javaArgList.add("-Dorg.lwjgl.util.Debug=true");
|
||||
javaArgList.add("-Dorg.lwjgl.util.DebugFunctions=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(Tools.generateLaunchClassPath(mProfile.getVersion()));
|
||||
@ -1050,7 +1055,7 @@ public class MainActivity extends AppCompatActivity implements OnTouchListener,
|
||||
if (exitCode != 0) {
|
||||
Tools.showError(this, new ErrnoException("java", exitCode), false);
|
||||
}
|
||||
} else {
|
||||
} else { // Type Invocation
|
||||
final FileDescriptor logFile = BinaryExecutor.redirectStdio();
|
||||
|
||||
new Thread(new Runnable() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user