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

Fix|Refactor: Handle custom resolutions on custom paths

Browse source
This commit is contained in:
Boulay Mathias 2022-11-01 16:37:37 +01:00
parent f52814f0dc
commit 00435f2fd7
7 changed files with 124 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View file

@ -57,7 +57,7 @@ public class MainActivity extends BaseActivity {
private LoggerView loggerView;
MinecraftAccount mProfile;
MinecraftProfile minecraftProfile;
public static MinecraftProfile minecraftProfile;
private DrawerLayout drawerLayout;
private ListView navDrawer;
@ -75,6 +75,12 @@ public class MainActivity extends BaseActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mProfile = PojavProfile.getCurrentProfileContent(this, null);
if(LauncherProfiles.mainProfileJson == null) LauncherProfiles.update();
minecraftProfile = LauncherProfiles.mainProfileJson.profiles.get(LauncherPreferences.DEFAULT_PREF.getString(LauncherPreferences.PREF_KEY_CURRENT_PROFILE,""));
MCOptionUtils.load(Tools.getGameDirPath(minecraftProfile));
initLayout(R.layout.activity_basemain);
// Set the sustained performance mode for available APIs
@ -134,7 +140,7 @@ public class MainActivity extends BaseActivity {
loggerView = findViewById(R.id.mainLoggerView);
mControlLayout = findViewById(R.id.main_control_layout);
mProfile = PojavProfile.getCurrentProfileContent(this);
LauncherProfiles.update();
minecraftProfile = LauncherProfiles.mainProfileJson.profiles.get(LauncherPreferences.DEFAULT_PREF.getString(LauncherPreferences.PREF_KEY_CURRENT_PROFILE,""));
if(minecraftProfile == null) {
@ -144,8 +150,7 @@ public class MainActivity extends BaseActivity {
}
String runtime = LauncherPreferences.PREF_DEFAULT_RUNTIME;
mVersionInfo = Tools.getVersionInfo(null, BaseLauncherActivity.getVersionId(
minecraftProfile.lastVersionId));
mVersionInfo = Tools.getVersionInfo(BaseLauncherActivity.getVersionId(minecraftProfile.lastVersionId));
if(minecraftProfile.javaDir != null && minecraftProfile.javaDir.startsWith(Tools.LAUNCHERPROFILES_RTPREFIX)) {
String runtimeName = minecraftProfile.javaDir.substring(Tools.LAUNCHERPROFILES_RTPREFIX.length());
if(MultiRTUtils.forceReread(runtimeName).versionString != null) {
@ -304,9 +309,8 @@ public class MainActivity extends BaseActivity {
JREUtils.redirectAndPrintJRELog();
LauncherProfiles.update();
Tools.launchMinecraft(this, mProfile, BaseLauncherActivity.getVersionId(
minecraftProfile.lastVersionId));
LauncherProfiles.update();
Tools.launchMinecraft(this, mProfile, minecraftProfile);
}
private void checkJavaArgsIsLaunchable(String jreVersion) throws Throwable {