2009Scape/2009Scape-mobile
1
0
Fork 0
mirror of https://github.com/2009scape/2009Scape-mobile.git synced 2025-12-20 13:30:15 -07:00
Code Issues Projects Releases Packages Wiki Activity

Print selected Minecraft version to latestlog.txt

Browse source
This commit is contained in:
Duy Tran Khanh 2021-06-12 05:18:02 +07:00 • committed by GitHub
parent 7caff641ec
commit 18f251e9c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View file

@ -94,7 +94,7 @@ public class BaseMainActivity extends LoggableActivity {
public NavigationView.OnNavigationItemSelectedListener ingameControlsEditorListener; public NavigationView.OnNavigationItemSelectedListener ingameControlsEditorListener;
// private String mQueueText = new String(); // private String mQueueText = new String();
protected JMinecraftVersionList.Version mVersionInfo; protected volatile JMinecraftVersionList.Version mVersionInfo;
private View.OnTouchListener glTouchListener; private View.OnTouchListener glTouchListener;
@ -900,6 +900,10 @@ public class BaseMainActivity extends LoggableActivity {
checkJavaArgsIsLaunchable(jreReleaseList.get("JAVA_VERSION")); checkJavaArgsIsLaunchable(jreReleaseList.get("JAVA_VERSION"));
// appendlnToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\""); // appendlnToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\"");
appendlnToLog("Info: Selected Minecraft version: " + mVersionInfo.id +
(mVersionInfo.inheritsFrom == null || mVersionInfo.inheritsFrom.equals(mVersionInfo.id)) ?
"" : " (" + mVersionInfo.inheritsFrom + ")");
JREUtils.redirectAndPrintJRELog(this, mProfile.accessToken); JREUtils.redirectAndPrintJRELog(this, mProfile.accessToken);
Tools.launchMinecraft(this, mProfile, mProfile.selectedVersion); Tools.launchMinecraft(this, mProfile, mProfile.selectedVersion);
} }
@ -907,9 +911,9 @@ public class BaseMainActivity extends LoggableActivity {
private void checkJavaArgsIsLaunchable(String jreVersion) throws Throwable { private void checkJavaArgsIsLaunchable(String jreVersion) throws Throwable {
appendlnToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\""); appendlnToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\"");
/*
if (jreVersion.equals("1.8.0")) return; if (jreVersion.equals("1.8.0")) return;
/*
// Test java // Test java
ShellProcessOperation shell = new ShellProcessOperation(new ShellProcessOperation.OnPrintListener(){ ShellProcessOperation shell = new ShellProcessOperation(new ShellProcessOperation.OnPrintListener(){
@Override @Override