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

Changes

Browse source 
- The game runs now
This commit is contained in:
artdeell 2021-12-05 15:13:06 +03:00
parent 213c6a7f84
commit 9608545111
5 changed files with 57 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,8 +27,11 @@ import net.kdt.pojavlaunch.customcontrols.*;
import net.kdt.pojavlaunch.multirt.MultiRTUtils;
import net.kdt.pojavlaunch.prefs.*;
import net.kdt.pojavlaunch.profiles.ProfileAdapter;
import net.kdt.pojavlaunch.utils.*;
import net.kdt.pojavlaunch.value.*;
import net.kdt.pojavlaunch.value.launcherprofiles.LauncherProfiles;
import org.lwjgl.glfw.*;
public class BaseMainActivity extends BaseActivity {
@ -59,7 +62,7 @@ public class BaseMainActivity extends BaseActivity {
protected void initLayout(int resId) {
setContentView(resId);
ProfileAdapter.clearIconCache();
try {
Logger.getInstance().reset();
// FIXME: is it safe fot multi thread?
@ -68,7 +71,13 @@ public class BaseMainActivity extends BaseActivity {
loggerView = findViewById(R.id.mainLoggerView);
mProfile = PojavProfile.getCurrentProfileContent(this);
mVersionInfo = Tools.getVersionInfo(null,mProfile.selectedVersion);
if(!LauncherPreferences.PREF_ENABLE_PROFILES) {
mVersionInfo = Tools.getVersionInfo(null, mProfile.selectedVersion);
}else{
LauncherProfiles.update();
mVersionInfo = Tools.getVersionInfo(null, BaseLauncherActivity.getVersionId(
LauncherProfiles.mainProfileJson.profiles.get(mProfile.selectedProfile).lastVersionId));
}
setTitle("Minecraft " + mProfile.selectedVersion);
PerVersionConfig.update();
@ -187,7 +196,14 @@ public class BaseMainActivity extends BaseActivity {
"" : " (" + mVersionInfo.inheritsFrom + ")"));
JREUtils.redirectAndPrintJRELog(this);
Tools.launchMinecraft(this, mProfile, mProfile.selectedVersion);
if(!LauncherPreferences.PREF_ENABLE_PROFILES){
Tools.launchMinecraft(this, mProfile, mProfile.selectedVersion);
}else{
LauncherProfiles.update();
Tools.launchMinecraft(this, mProfile, BaseLauncherActivity.getVersionId(
LauncherProfiles.mainProfileJson.profiles.get(mProfile.selectedProfile).lastVersionId));
}
}
private void checkJavaArgsIsLaunchable(String jreVersion) throws Throwable {