Merge remote-tracking branch 'origin/feature_commands' into integration_butchery
This commit is contained in:
commit
7fd56a30bd
@ -28,6 +28,11 @@ void INISettingsObject::setFilePath(const QString &filePath)
|
|||||||
m_filePath = filePath;
|
m_filePath = filePath;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool INISettingsObject::reload()
|
||||||
|
{
|
||||||
|
return m_ini.loadFile(m_filePath) && SettingsObject::reload();
|
||||||
|
}
|
||||||
|
|
||||||
void INISettingsObject::changeSetting(const Setting &setting, QVariant value)
|
void INISettingsObject::changeSetting(const Setting &setting, QVariant value)
|
||||||
{
|
{
|
||||||
if (contains(setting.id()))
|
if (contains(setting.id()))
|
||||||
|
@ -47,6 +47,8 @@ public:
|
|||||||
*/
|
*/
|
||||||
virtual void setFilePath(const QString &filePath);
|
virtual void setFilePath(const QString &filePath);
|
||||||
|
|
||||||
|
bool reload() override;
|
||||||
|
|
||||||
protected
|
protected
|
||||||
slots:
|
slots:
|
||||||
virtual void changeSetting(const Setting &setting, QVariant value);
|
virtual void changeSetting(const Setting &setting, QVariant value);
|
||||||
|
@ -126,6 +126,15 @@ bool SettingsObject::contains(const QString &id)
|
|||||||
return m_settings.contains(id);
|
return m_settings.contains(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool SettingsObject::reload()
|
||||||
|
{
|
||||||
|
for (auto setting : m_settings.values())
|
||||||
|
{
|
||||||
|
setting->set(setting->get());
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
void SettingsObject::connectSignals(const Setting &setting)
|
void SettingsObject::connectSignals(const Setting &setting)
|
||||||
{
|
{
|
||||||
connect(&setting, SIGNAL(settingChanged(const Setting &, QVariant)),
|
connect(&setting, SIGNAL(settingChanged(const Setting &, QVariant)),
|
||||||
|
@ -113,6 +113,12 @@ public:
|
|||||||
*/
|
*/
|
||||||
bool contains(const QString &id);
|
bool contains(const QString &id);
|
||||||
|
|
||||||
|
/*!
|
||||||
|
* \brief Reloads the settings and emit signals for changed settings
|
||||||
|
* \return True if reloading was successful
|
||||||
|
*/
|
||||||
|
virtual bool reload();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
/*!
|
/*!
|
||||||
* \brief Signal emitted when one of this SettingsObject object's settings changes.
|
* \brief Signal emitted when one of this SettingsObject object's settings changes.
|
||||||
|
@ -45,6 +45,12 @@ GroupView::~GroupView()
|
|||||||
m_groups.clear();
|
m_groups.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GroupView::setModel(QAbstractItemModel *model)
|
||||||
|
{
|
||||||
|
QAbstractItemView::setModel(model);
|
||||||
|
connect(model, &QAbstractItemModel::modelReset, this, &GroupView::modelReset);
|
||||||
|
}
|
||||||
|
|
||||||
void GroupView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
|
void GroupView::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight,
|
||||||
const QVector<int> &roles)
|
const QVector<int> &roles)
|
||||||
{
|
{
|
||||||
@ -133,6 +139,12 @@ void GroupView::updateGeometries()
|
|||||||
viewport()->update();
|
viewport()->update();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GroupView::modelReset()
|
||||||
|
{
|
||||||
|
scheduleDelayedItemsLayout();
|
||||||
|
executeDelayedItemsLayout();
|
||||||
|
}
|
||||||
|
|
||||||
bool GroupView::isIndexHidden(const QModelIndex &index) const
|
bool GroupView::isIndexHidden(const QModelIndex &index) const
|
||||||
{
|
{
|
||||||
Group *cat = category(index);
|
Group *cat = category(index);
|
||||||
|
@ -24,6 +24,8 @@ public:
|
|||||||
GroupView(QWidget *parent = 0);
|
GroupView(QWidget *parent = 0);
|
||||||
~GroupView();
|
~GroupView();
|
||||||
|
|
||||||
|
void setModel(QAbstractItemModel *model) override;
|
||||||
|
|
||||||
/// return geometry rectangle occupied by the specified model item
|
/// return geometry rectangle occupied by the specified model item
|
||||||
QRect geometryRect(const QModelIndex &index) const;
|
QRect geometryRect(const QModelIndex &index) const;
|
||||||
/// return visual rectangle occupied by the specified model item
|
/// return visual rectangle occupied by the specified model item
|
||||||
@ -69,6 +71,7 @@ slots:
|
|||||||
virtual void rowsInserted(const QModelIndex &parent, int start, int end) override;
|
virtual void rowsInserted(const QModelIndex &parent, int start, int end) override;
|
||||||
virtual void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override;
|
virtual void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override;
|
||||||
virtual void updateGeometries() override;
|
virtual void updateGeometries() override;
|
||||||
|
void modelReset();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual bool isIndexHidden(const QModelIndex &index) const override;
|
virtual bool isIndexHidden(const QModelIndex &index) const override;
|
||||||
|
@ -169,6 +169,11 @@ bool BaseInstance::canLaunch() const
|
|||||||
return !(flags() & VersionBrokenFlag);
|
return !(flags() & VersionBrokenFlag);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool BaseInstance::reload()
|
||||||
|
{
|
||||||
|
return settings().reload();
|
||||||
|
}
|
||||||
|
|
||||||
QString BaseInstance::baseJar() const
|
QString BaseInstance::baseJar() const
|
||||||
{
|
{
|
||||||
I_D(BaseInstance);
|
I_D(BaseInstance);
|
||||||
|
@ -190,6 +190,8 @@ public:
|
|||||||
|
|
||||||
bool canLaunch() const;
|
bool canLaunch() const;
|
||||||
|
|
||||||
|
virtual bool reload();
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
/*!
|
/*!
|
||||||
* \brief Signal emitted when properties relevant to the instance view change
|
* \brief Signal emitted when properties relevant to the instance view change
|
||||||
|
@ -49,9 +49,11 @@ MinecraftProcess::MinecraftProcess(BaseInstance *inst) : m_instance(inst)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// export some infos
|
// export some infos
|
||||||
env.insert("INST_NAME", inst->name());
|
auto variables = getVariables();
|
||||||
env.insert("INST_ID", inst->id());
|
for (auto it = variables.begin(); it != variables.end(); ++it)
|
||||||
env.insert("INST_DIR", QDir(inst->instanceRoot()).absolutePath());
|
{
|
||||||
|
env.insert(it.key(), it.value());
|
||||||
|
}
|
||||||
|
|
||||||
this->setProcessEnvironment(env);
|
this->setProcessEnvironment(env);
|
||||||
m_prepostlaunchprocess.setProcessEnvironment(env);
|
m_prepostlaunchprocess.setProcessEnvironment(env);
|
||||||
@ -63,10 +65,10 @@ MinecraftProcess::MinecraftProcess(BaseInstance *inst) : m_instance(inst)
|
|||||||
// Log prepost launch command output (can be disabled.)
|
// Log prepost launch command output (can be disabled.)
|
||||||
if (m_instance->settings().get("LogPrePostOutput").toBool())
|
if (m_instance->settings().get("LogPrePostOutput").toBool())
|
||||||
{
|
{
|
||||||
connect(&m_prepostlaunchprocess, &QProcess::readyReadStandardError,
|
connect(&m_prepostlaunchprocess, &QProcess::readyReadStandardError, this,
|
||||||
this, &MinecraftProcess::on_prepost_stdErr);
|
&MinecraftProcess::on_prepost_stdErr);
|
||||||
connect(&m_prepostlaunchprocess, &QProcess::readyReadStandardOutput,
|
connect(&m_prepostlaunchprocess, &QProcess::readyReadStandardOutput, this,
|
||||||
this, &MinecraftProcess::on_prepost_stdOut);
|
&MinecraftProcess::on_prepost_stdOut);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -79,10 +81,10 @@ void MinecraftProcess::setWorkdir(QString path)
|
|||||||
|
|
||||||
QString MinecraftProcess::censorPrivateInfo(QString in)
|
QString MinecraftProcess::censorPrivateInfo(QString in)
|
||||||
{
|
{
|
||||||
if(!m_session)
|
if (!m_session)
|
||||||
return in;
|
return in;
|
||||||
|
|
||||||
if(m_session->session != "-")
|
if (m_session->session != "-")
|
||||||
in.replace(m_session->session, "<SESSION ID>");
|
in.replace(m_session->session, "<SESSION ID>");
|
||||||
in.replace(m_session->access_token, "<ACCESS TOKEN>");
|
in.replace(m_session->access_token, "<ACCESS TOKEN>");
|
||||||
in.replace(m_session->client_token, "<CLIENT TOKEN>");
|
in.replace(m_session->client_token, "<CLIENT TOKEN>");
|
||||||
@ -113,7 +115,7 @@ MessageLevel::Enum MinecraftProcess::guessLevel(const QString &line, MessageLeve
|
|||||||
level = MessageLevel::Fatal;
|
level = MessageLevel::Fatal;
|
||||||
if (line.contains("[DEBUG]"))
|
if (line.contains("[DEBUG]"))
|
||||||
level = MessageLevel::Debug;
|
level = MessageLevel::Debug;
|
||||||
if(line.contains("overwriting existing"))
|
if (line.contains("overwriting existing"))
|
||||||
level = MessageLevel::Fatal;
|
level = MessageLevel::Fatal;
|
||||||
return level;
|
return level;
|
||||||
}
|
}
|
||||||
@ -139,17 +141,15 @@ MessageLevel::Enum MinecraftProcess::getLevel(const QString &levelName)
|
|||||||
return MessageLevel::Message;
|
return MessageLevel::Message;
|
||||||
}
|
}
|
||||||
|
|
||||||
void MinecraftProcess::logOutput(const QStringList &lines,
|
void MinecraftProcess::logOutput(const QStringList &lines, MessageLevel::Enum defaultLevel,
|
||||||
MessageLevel::Enum defaultLevel,
|
|
||||||
bool guessLevel, bool censor)
|
bool guessLevel, bool censor)
|
||||||
{
|
{
|
||||||
for (int i = 0; i < lines.size(); ++i)
|
for (int i = 0; i < lines.size(); ++i)
|
||||||
logOutput(lines[i], defaultLevel, guessLevel, censor);
|
logOutput(lines[i], defaultLevel, guessLevel, censor);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MinecraftProcess::logOutput(QString line,
|
void MinecraftProcess::logOutput(QString line, MessageLevel::Enum defaultLevel, bool guessLevel,
|
||||||
MessageLevel::Enum defaultLevel,
|
bool censor)
|
||||||
bool guessLevel, bool censor)
|
|
||||||
{
|
{
|
||||||
MessageLevel::Enum level = defaultLevel;
|
MessageLevel::Enum level = defaultLevel;
|
||||||
|
|
||||||
@ -251,33 +251,7 @@ void MinecraftProcess::finish(int code, ExitStatus status)
|
|||||||
m_prepostlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(code));
|
m_prepostlaunchprocess.processEnvironment().insert("INST_EXITCODE", QString(code));
|
||||||
|
|
||||||
// run post-exit
|
// run post-exit
|
||||||
QString postlaunch_cmd = m_instance->settings().get("PostExitCommand").toString();
|
postLaunch();
|
||||||
if (!postlaunch_cmd.isEmpty())
|
|
||||||
{
|
|
||||||
emit log(tr("Running Post-Launch command: %1").arg(postlaunch_cmd));
|
|
||||||
m_prepostlaunchprocess.start(postlaunch_cmd);
|
|
||||||
m_prepostlaunchprocess.waitForFinished();
|
|
||||||
// Flush console window
|
|
||||||
if (!m_err_leftover.isEmpty())
|
|
||||||
{
|
|
||||||
logOutput(m_err_leftover, MessageLevel::PrePost);
|
|
||||||
m_err_leftover.clear();
|
|
||||||
}
|
|
||||||
if (!m_out_leftover.isEmpty())
|
|
||||||
{
|
|
||||||
logOutput(m_out_leftover, MessageLevel::PrePost);
|
|
||||||
m_out_leftover.clear();
|
|
||||||
}
|
|
||||||
if (m_prepostlaunchprocess.exitStatus() != NormalExit)
|
|
||||||
{
|
|
||||||
emit log(tr("Post-Launch command failed with code %1.\n\n").arg(m_prepostlaunchprocess.exitCode()),
|
|
||||||
MessageLevel::Error);
|
|
||||||
emit postlaunch_failed(m_instance, m_prepostlaunchprocess.exitCode(),
|
|
||||||
m_prepostlaunchprocess.exitStatus());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
emit log(tr("Post-Launch command ran successfully.\n\n"));
|
|
||||||
}
|
|
||||||
m_instance->cleanupAfterRun();
|
m_instance->cleanupAfterRun();
|
||||||
emit ended(m_instance, code, status);
|
emit ended(m_instance, code, status);
|
||||||
}
|
}
|
||||||
@ -288,14 +262,12 @@ void MinecraftProcess::killMinecraft()
|
|||||||
kill();
|
kill();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MinecraftProcess::arm()
|
bool MinecraftProcess::preLaunch()
|
||||||
{
|
{
|
||||||
emit log("MultiMC version: " + MMC->version().toString() + "\n\n");
|
|
||||||
emit log("Minecraft folder is:\n" + workingDirectory() + "\n\n");
|
|
||||||
|
|
||||||
QString prelaunch_cmd = m_instance->settings().get("PreLaunchCommand").toString();
|
QString prelaunch_cmd = m_instance->settings().get("PreLaunchCommand").toString();
|
||||||
if (!prelaunch_cmd.isEmpty())
|
if (!prelaunch_cmd.isEmpty())
|
||||||
{
|
{
|
||||||
|
prelaunch_cmd = substituteVariables(prelaunch_cmd);
|
||||||
// Launch
|
// Launch
|
||||||
emit log(tr("Running Pre-Launch command: %1").arg(prelaunch_cmd));
|
emit log(tr("Running Pre-Launch command: %1").arg(prelaunch_cmd));
|
||||||
m_prepostlaunchprocess.start(prelaunch_cmd);
|
m_prepostlaunchprocess.start(prelaunch_cmd);
|
||||||
@ -315,45 +287,127 @@ void MinecraftProcess::arm()
|
|||||||
// Process return values
|
// Process return values
|
||||||
if (m_prepostlaunchprocess.exitStatus() != NormalExit)
|
if (m_prepostlaunchprocess.exitStatus() != NormalExit)
|
||||||
{
|
{
|
||||||
emit log(tr("Pre-Launch command failed with code %1.\n\n").arg(m_prepostlaunchprocess.exitCode()),
|
emit log(tr("Pre-Launch command failed with code %1.\n\n")
|
||||||
|
.arg(m_prepostlaunchprocess.exitCode()),
|
||||||
MessageLevel::Fatal);
|
MessageLevel::Fatal);
|
||||||
m_instance->cleanupAfterRun();
|
m_instance->cleanupAfterRun();
|
||||||
emit prelaunch_failed(m_instance, m_prepostlaunchprocess.exitCode(),
|
emit prelaunch_failed(m_instance, m_prepostlaunchprocess.exitCode(),
|
||||||
m_prepostlaunchprocess.exitStatus());
|
m_prepostlaunchprocess.exitStatus());
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
emit log(tr("Pre-Launch command ran successfully.\n\n"));
|
emit log(tr("Pre-Launch command ran successfully.\n\n"));
|
||||||
|
|
||||||
|
return m_instance->reload();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
bool MinecraftProcess::postLaunch()
|
||||||
|
{
|
||||||
|
QString postlaunch_cmd = m_instance->settings().get("PostExitCommand").toString();
|
||||||
|
if (!postlaunch_cmd.isEmpty())
|
||||||
|
{
|
||||||
|
postlaunch_cmd = substituteVariables(postlaunch_cmd);
|
||||||
|
emit log(tr("Running Post-Launch command: %1").arg(postlaunch_cmd));
|
||||||
|
m_prepostlaunchprocess.start(postlaunch_cmd);
|
||||||
|
m_prepostlaunchprocess.waitForFinished();
|
||||||
|
// Flush console window
|
||||||
|
if (!m_err_leftover.isEmpty())
|
||||||
|
{
|
||||||
|
logOutput(m_err_leftover, MessageLevel::PrePost);
|
||||||
|
m_err_leftover.clear();
|
||||||
|
}
|
||||||
|
if (!m_out_leftover.isEmpty())
|
||||||
|
{
|
||||||
|
logOutput(m_out_leftover, MessageLevel::PrePost);
|
||||||
|
m_out_leftover.clear();
|
||||||
|
}
|
||||||
|
if (m_prepostlaunchprocess.exitStatus() != NormalExit)
|
||||||
|
{
|
||||||
|
emit log(tr("Post-Launch command failed with code %1.\n\n")
|
||||||
|
.arg(m_prepostlaunchprocess.exitCode()),
|
||||||
|
MessageLevel::Error);
|
||||||
|
emit postlaunch_failed(m_instance, m_prepostlaunchprocess.exitCode(),
|
||||||
|
m_prepostlaunchprocess.exitStatus());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
emit log(tr("Post-Launch command ran successfully.\n\n"));
|
||||||
|
|
||||||
|
return m_instance->reload();
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
QMap<QString, QString> MinecraftProcess::getVariables() const
|
||||||
|
{
|
||||||
|
QMap<QString, QString> out;
|
||||||
|
out.insert("INST_NAME", m_instance->name());
|
||||||
|
out.insert("INST_ID", m_instance->id());
|
||||||
|
out.insert("INST_DIR", QDir(m_instance->instanceRoot()).absolutePath());
|
||||||
|
out.insert("INST_MC_DIR", QDir(m_instance->minecraftRoot()).absolutePath());
|
||||||
|
out.insert("INST_JAVA", m_instance->settings().get("JavaPath").toString());
|
||||||
|
out.insert("INST_JAVA_ARGS", javaArguments().join(' '));
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
QString MinecraftProcess::substituteVariables(const QString &cmd) const
|
||||||
|
{
|
||||||
|
QString out = cmd;
|
||||||
|
auto variables = getVariables();
|
||||||
|
for (auto it = variables.begin(); it != variables.end(); ++it)
|
||||||
|
{
|
||||||
|
out.replace("$" + it.key(), it.value());
|
||||||
|
}
|
||||||
|
auto env = QProcessEnvironment::systemEnvironment();
|
||||||
|
for (auto var : env.keys())
|
||||||
|
{
|
||||||
|
out.replace("$" + var, env.value(var));
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
QStringList MinecraftProcess::javaArguments() const
|
||||||
|
{
|
||||||
|
QStringList args;
|
||||||
|
|
||||||
|
// custom args go first. we want to override them if we have our own here.
|
||||||
|
args.append(m_instance->extraArguments());
|
||||||
|
|
||||||
|
// OSX dock icon and name
|
||||||
|
#ifdef OSX
|
||||||
|
args << "-Xdock:icon=icon.png";
|
||||||
|
args << QString("-Xdock:name=\"%1\"").arg(m_instance->windowTitle());
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// HACK: Stupid hack for Intel drivers. See: https://mojang.atlassian.net/browse/MCL-767
|
||||||
|
#ifdef Q_OS_WIN32
|
||||||
|
args << QString("-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_"
|
||||||
|
"minecraft.exe.heapdump");
|
||||||
|
#endif
|
||||||
|
|
||||||
|
args << QString("-Xms%1m").arg(m_instance->settings().get("MinMemAlloc").toInt());
|
||||||
|
args << QString("-Xmx%1m").arg(m_instance->settings().get("MaxMemAlloc").toInt());
|
||||||
|
args << QString("-XX:PermSize=%1m").arg(m_instance->settings().get("PermGen").toInt());
|
||||||
|
if (!m_nativeFolder.isEmpty())
|
||||||
|
args << QString("-Djava.library.path=%1").arg(m_nativeFolder);
|
||||||
|
args << "-jar" << PathCombine(MMC->bin(), "jars", "NewLaunch.jar");
|
||||||
|
|
||||||
|
return args;
|
||||||
|
}
|
||||||
|
|
||||||
|
void MinecraftProcess::arm()
|
||||||
|
{
|
||||||
|
emit log("MultiMC version: " + MMC->version().toString() + "\n\n");
|
||||||
|
emit log("Minecraft folder is:\n" + workingDirectory() + "\n\n");
|
||||||
|
|
||||||
|
if (!preLaunch())
|
||||||
|
{
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
m_instance->setLastLaunch();
|
m_instance->setLastLaunch();
|
||||||
auto &settings = m_instance->settings();
|
auto &settings = m_instance->settings();
|
||||||
|
|
||||||
//////////// java arguments ////////////
|
QStringList args = javaArguments();
|
||||||
QStringList args;
|
|
||||||
{
|
|
||||||
// custom args go first. we want to override them if we have our own here.
|
|
||||||
args.append(m_instance->extraArguments());
|
|
||||||
|
|
||||||
// OSX dock icon and name
|
|
||||||
#ifdef OSX
|
|
||||||
args << "-Xdock:icon=icon.png";
|
|
||||||
args << QString("-Xdock:name=\"%1\"").arg(m_instance->windowTitle());
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// HACK: Stupid hack for Intel drivers. See: https://mojang.atlassian.net/browse/MCL-767
|
|
||||||
#ifdef Q_OS_WIN32
|
|
||||||
args << QString("-XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_"
|
|
||||||
"minecraft.exe.heapdump");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
args << QString("-Xms%1m").arg(settings.get("MinMemAlloc").toInt());
|
|
||||||
args << QString("-Xmx%1m").arg(settings.get("MaxMemAlloc").toInt());
|
|
||||||
args << QString("-XX:PermSize=%1m").arg(settings.get("PermGen").toInt());
|
|
||||||
if(!m_nativeFolder.isEmpty())
|
|
||||||
args << QString("-Djava.library.path=%1").arg(m_nativeFolder);
|
|
||||||
args << "-jar" << PathCombine(MMC->bin(), "jars", "NewLaunch.jar");
|
|
||||||
}
|
|
||||||
|
|
||||||
QString JavaPath = m_instance->settings().get("JavaPath").toString();
|
QString JavaPath = m_instance->settings().get("JavaPath").toString();
|
||||||
emit log("Java path is:\n" + JavaPath + "\n\n");
|
emit log("Java path is:\n" + JavaPath + "\n\n");
|
||||||
|
@ -131,6 +131,13 @@ protected:
|
|||||||
QString launchScript;
|
QString launchScript;
|
||||||
QString m_nativeFolder;
|
QString m_nativeFolder;
|
||||||
|
|
||||||
|
bool preLaunch();
|
||||||
|
bool postLaunch();
|
||||||
|
QMap<QString, QString> getVariables() const;
|
||||||
|
QString substituteVariables(const QString &cmd) const;
|
||||||
|
|
||||||
|
QStringList javaArguments() const;
|
||||||
|
|
||||||
protected
|
protected
|
||||||
slots:
|
slots:
|
||||||
void finish(int, QProcess::ExitStatus status);
|
void finish(int, QProcess::ExitStatus status);
|
||||||
|
@ -423,6 +423,11 @@ bool OneSixInstance::providesVersionFile() const
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool OneSixInstance::reload()
|
||||||
|
{
|
||||||
|
return BaseInstance::reload() && reloadVersion();
|
||||||
|
}
|
||||||
|
|
||||||
QString OneSixInstance::loaderModsDir() const
|
QString OneSixInstance::loaderModsDir() const
|
||||||
{
|
{
|
||||||
return PathCombine(minecraftRoot(), "mods");
|
return PathCombine(minecraftRoot(), "mods");
|
||||||
|
@ -79,6 +79,8 @@ public:
|
|||||||
virtual QStringList externalPatches() const;
|
virtual QStringList externalPatches() const;
|
||||||
virtual bool providesVersionFile() const;
|
virtual bool providesVersionFile() const;
|
||||||
|
|
||||||
|
bool reload() override;
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void versionReloaded();
|
void versionReloaded();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user