diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileEditor.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileEditor.java index ca6af7813..3dd2203d8 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileEditor.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/profiles/ProfileEditor.java @@ -45,6 +45,7 @@ public class ProfileEditor implements ExtraListener> { private final Spinner mJavaRuntimeSpinner; private final Spinner mRendererSpinner; private final EditText mPathSelectionEditText; + private final EditText mArgChangerEditText; private final List mRenderNames; private final AlertDialog mDialog; private String mSelectedVersionId; @@ -80,6 +81,7 @@ public class ProfileEditor implements ExtraListener> { mProfileIconImageView = mMainView.findViewById(R.id.vprof_editor_icon); ((TextView)mMainView.findViewById(R.id.vprof_editor_beginPathView)).setText(Tools.DIR_GAME_HOME+"/"); mPathSelectionEditText = mMainView.findViewById(R.id.vprof_editor_path); + mArgChangerEditText = mMainView.findViewById(R.id.vprof_editor_jre_args); builder.setPositiveButton(R.string.global_save,this::save); builder.setNegativeButton(android.R.string.cancel,(dialog,which)->destroy(dialog)); @@ -152,9 +154,12 @@ public class ProfileEditor implements ExtraListener> { ArrayList versions = (ArrayList) ExtraCore.getValue(ExtraConstants.VERSION_LIST); BaseLauncherActivity.updateVersionSpinner(context,versions,mVersionSpinner, mSelectedVersionId); - if(minecraftProfile.gameDir != null && minecraftProfile.gameDir.startsWith(Tools.LAUNCHERPROFILES_RTPREFIX)) { + if(minecraftProfile.gameDir != null && minecraftProfile.gameDir.startsWith(Tools.LAUNCHERPROFILES_RTPREFIX)) mPathSelectionEditText.setText(minecraftProfile.gameDir.substring(Tools.LAUNCHERPROFILES_RTPREFIX.length())); - } + else mPathSelectionEditText.setText(""); + + if(minecraftProfile.javaArgs != null) mArgChangerEditText.setText(minecraftProfile.javaArgs); + else mArgChangerEditText.setText(""); mDialog.show(); return true; } @@ -189,9 +194,11 @@ public class ProfileEditor implements ExtraListener> { if(mRendererSpinner.getSelectedItemPosition() == mRenderNames.size()) profile.pojavRendererName = null; else profile.pojavRendererName = mRenderNames.get(mRendererSpinner.getSelectedItemPosition()); String selectedPath = mPathSelectionEditText.getText().toString(); - if(!selectedPath.isEmpty()) { - profile.gameDir = Tools.LAUNCHERPROFILES_RTPREFIX+selectedPath; - } + String arguments = mArgChangerEditText.getText().toString(); + if(!selectedPath.isEmpty()) profile.gameDir = Tools.LAUNCHERPROFILES_RTPREFIX+selectedPath; + else profile.gameDir = null; + if(!arguments.isEmpty()) profile.javaArgs = arguments; + else profile.javaArgs = null; LauncherProfiles.mainProfileJson.profiles.put(mEditingProfile,profile); mEditSaveCallback.onSave(mEditingProfile,isNew, false); destroy(dialog); diff --git a/app_pojavlauncher/src/main/res/layout/version_profile_editor.xml b/app_pojavlauncher/src/main/res/layout/version_profile_editor.xml index 8dca17ca6..e8997dff9 100644 --- a/app_pojavlauncher/src/main/res/layout/version_profile_editor.xml +++ b/app_pojavlauncher/src/main/res/layout/version_profile_editor.xml @@ -64,7 +64,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/vprof_editor_path" /> + app:layout_constraintTop_toBottomOf="@+id/vprof_editor_jre_args" /> @@ -131,5 +132,27 @@ app:layout_constraintBottom_toTopOf="@+id/vprof_editor_path" app:layout_constraintStart_toStartOf="@+id/vprof_editor_path" /> + + + + \ No newline at end of file