diff options
| -rw-r--r-- | application/MultiMC.cpp | 3 | ||||
| -rw-r--r-- | application/pages/global/JavaPage.cpp | 2 | ||||
| -rw-r--r-- | application/pages/global/JavaPage.ui | 24 | ||||
| -rw-r--r-- | logic/BaseInstance.cpp | 1 | ||||
| -rw-r--r-- | logic/minecraft/MinecraftProcess.cpp | 23 |
5 files changed, 46 insertions, 7 deletions
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index 122890d1..baeb9de1 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -472,6 +472,9 @@ void MultiMC::initGlobalSettings(bool test_mode) m_settings->registerSetting("JavaDetectionHack", ""); m_settings->registerSetting("JvmArgs", ""); + // Wrapper command for launch + m_settings->registerSetting("WrapperCommand", ""); + // Custom Commands m_settings->registerSetting({"PreLaunchCommand", "PreLaunchCmd"}, ""); m_settings->registerSetting({"PostExitCommand", "PostExitCmd"}, ""); diff --git a/application/pages/global/JavaPage.cpp b/application/pages/global/JavaPage.cpp index 3daf35dc..d201bb2f 100644 --- a/application/pages/global/JavaPage.cpp +++ b/application/pages/global/JavaPage.cpp @@ -70,6 +70,7 @@ void JavaPage::applySettings() // Custom Commands s->set("PreLaunchCommand", ui->preLaunchCmdTextBox->text()); + s->set("WrapperCommand", ui->wrapperCmdTextBox->text()); s->set("PostExitCommand", ui->postExitCmdTextBox->text()); } void JavaPage::loadSettings() @@ -86,6 +87,7 @@ void JavaPage::loadSettings() // Custom Commands ui->preLaunchCmdTextBox->setText(s->get("PreLaunchCommand").toString()); + ui->wrapperCmdTextBox->setText(s->get("WrapperCommand").toString()); ui->postExitCmdTextBox->setText(s->get("PostExitCommand").toString()); } diff --git a/application/pages/global/JavaPage.ui b/application/pages/global/JavaPage.ui index f9c629c2..f1bc3781 100644 --- a/application/pages/global/JavaPage.ui +++ b/application/pages/global/JavaPage.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>545</width> - <height>609</height> + <height>559</height> </rect> </property> <property name="sizePolicy"> @@ -238,7 +238,7 @@ <string>Custom Commands</string> </property> <layout class="QGridLayout" name="gridLayout_4"> - <item row="1" column="0"> + <item row="3" column="0"> <widget class="QLabel" name="labelPostExitCmd"> <property name="text"> <string>Post-exit command:</string> @@ -255,9 +255,19 @@ <item row="0" column="1"> <widget class="QLineEdit" name="preLaunchCmdTextBox"/> </item> - <item row="1" column="1"> + <item row="3" column="1"> <widget class="QLineEdit" name="postExitCmdTextBox"/> </item> + <item row="1" column="0"> + <widget class="QLabel" name="labelWrapperCmd"> + <property name="text"> + <string>Wrapper command:</string> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLineEdit" name="wrapperCmdTextBox"/> + </item> </layout> </widget> </item> @@ -270,7 +280,7 @@ </sizepolicy> </property> <property name="text"> - <string>Pre-launch command runs before the instance launches and post-exit command runs after it exits. Both will be run in MultiMC's working directory with INST_ID, INST_DIR, and INST_NAME as environment variables.</string> + <string><html><head/><body><p>Pre-launch command runs before the instance launches and post-exit command runs after it exits. Both will be run in MultiMC's working directory with INST_ID, INST_DIR, and INST_NAME as environment variables.</p><p>Wrapper command allows running java using an extra wrapper program (like 'optirun' on Linux)</p></body></html></string> </property> <property name="alignment"> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> @@ -290,11 +300,15 @@ <tabstop>minMemSpinBox</tabstop> <tabstop>maxMemSpinBox</tabstop> <tabstop>permGenSpinBox</tabstop> - <tabstop>javaPathTextBox</tabstop> <tabstop>javaBrowseBtn</tabstop> + <tabstop>javaPathTextBox</tabstop> <tabstop>jvmArgsTextBox</tabstop> + <tabstop>javaDetectBtn</tabstop> + <tabstop>javaTestBtn</tabstop> <tabstop>preLaunchCmdTextBox</tabstop> + <tabstop>wrapperCmdTextBox</tabstop> <tabstop>postExitCmdTextBox</tabstop> + <tabstop>tabWidget</tabstop> </tabstops> <resources/> <connections/> diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp index 661e4587..0a0bc961 100644 --- a/logic/BaseInstance.cpp +++ b/logic/BaseInstance.cpp @@ -42,6 +42,7 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s // Custom Commands m_settings->registerSetting({"OverrideCommands","OverrideLaunchCmd"}, false); m_settings->registerOverride(globalSettings->getSetting("PreLaunchCommand")); + m_settings->registerOverride(globalSettings->getSetting("WrapperCommand")); m_settings->registerOverride(globalSettings->getSetting("PostExitCommand")); // Console diff --git a/logic/minecraft/MinecraftProcess.cpp b/logic/minecraft/MinecraftProcess.cpp index d52eb97c..71dd81ed 100644 --- a/logic/minecraft/MinecraftProcess.cpp +++ b/logic/minecraft/MinecraftProcess.cpp @@ -238,8 +238,27 @@ void MinecraftProcess::arm() QString allArgs = args.join(", "); emit log("Java Arguments:\n[" + censorPrivateInfo(allArgs) + "]\n\n"); - // instantiate the launcher part - start(JavaPath, args); + QString wrapperCommand = m_instance->settings()->get("WrapperCommand").toString(); + if(!wrapperCommand.isEmpty()) + { + auto realWrapperCommand = QStandardPaths::findExecutable(wrapperCommand); + if (realWrapperCommand.isEmpty()) + { + emit log(tr("The wrapper command \"%1\" couldn't be found.").arg(wrapperCommand), MessageLevel::Warning); + m_instance->cleanupAfterRun(); + emit launch_failed(m_instance); + m_instance->setRunning(false); + return; + } + emit log("Wrapper command is:\n" + wrapperCommand + "\n\n"); + args.prepend(JavaPath); + start(wrapperCommand, args); + } + else + { + start(JavaPath, args); + } + if (!waitForStarted()) { //: Error message displayed if instace can't start |