mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-09-15 15:13:15 +00:00
Code Issues Projects Releases Wiki Activity

GH-253 implement launching instances from command line

Browse Source
This commit is contained in:
Petr Mrázek 2015-09-30 00:11:00 +02:00
parent e993b1152d
commit e2fd299fc5
4 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/MultiMC.cpp
View File

@ -84,6 +84,10 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar
parser.addShortOpt("dir", 'd');
parser.addDocumentation("dir", "use the supplied directory as MultiMC root instead of "
"the binary location (use '.' for current)");
// --launch
parser.addOption("launch");
parser.addShortOpt("launch", 'l');
parser.addDocumentation("launch", "launch the specified instance (by instance ID)");
// parse the arguments
try
@ -135,6 +139,8 @@ MultiMC::MultiMC(int &argc, char **argv, bool test_mode) : QApplication(argc, ar
adjustedBy += "Fallback to binary path " + dataPath;
}
launchId = args["launch"].toString();
if (!ensureFolderPathExists(dataPath) || !QDir::setCurrent(dataPath))
{
// BAD STUFF. WHAT DO?

1
application/MultiMC.h
View File

@ -180,5 +180,6 @@ private:
Status m_status = MultiMC::Failed;
public:
QString launchId;
std::shared_ptr<QFile> logFile;
};

30
application/main.cpp
View File

@ -1,10 +1,11 @@
#include "MultiMC.h"
#include "MainWindow.h"
#include "LaunchInteraction.h"
#include <InstanceList.h>
#include <QDebug>
int main_gui(MultiMC &app)
int launchMainWindow(MultiMC &app)
{
// show main window
app.setIconTheme(MMC->settings()->get("IconTheme").toString());
MainWindow mainWin;
mainWin.restoreState(QByteArray::fromBase64(MMC->settings()->get("MainWindowState").toByteArray()));
mainWin.restoreGeometry(QByteArray::fromBase64(MMC->settings()->get("MainWindowGeometry").toByteArray()));
@ -13,6 +14,29 @@ int main_gui(MultiMC &app)
mainWin.checkInstancePathForProblems();
return app.exec();
}
int launchInstance(MultiMC &app, InstancePtr inst)
{
app.minecraftlist();
LaunchController launchController;
launchController.setInstance(inst);
launchController.setOnline(true);
launchController.launch();
return app.exec();
}
int main_gui(MultiMC &app)
{
app.setIconTheme(MMC->settings()->get("IconTheme").toString());
// show main window
auto inst = app.instances()->getInstanceById(app.launchId);
if(inst)
{
return launchInstance(app, inst);
}
return launchMainWindow(app);
}
int main(int argc, char *argv[])
{
// initialize Qt

19
logic/InstanceList.cpp
View File

@ -362,23 +362,16 @@ int InstanceList::add(InstancePtr t)
InstancePtr InstanceList::getInstanceById(QString instId) const
{
if (m_instances.isEmpty())
{
if(instId.isEmpty())
return InstancePtr();
}
QListIterator<InstancePtr> iter(m_instances);
InstancePtr inst;
while (iter.hasNext())
for(auto & inst: m_instances)
{
inst = iter.next();
if (inst->id() == instId)
break;
{
return inst;
}
}
if (inst->id() != instId)
return InstancePtr();
else
return iter.peekPrevious();
return InstancePtr();
}
QModelIndex InstanceList::getInstanceIndexById(const QString &id) const