summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-07-21 09:21:59 +0200
committerPetr Mrázek <peterix@gmail.com>2015-07-21 09:21:59 +0200
commit2fc18921b04536285ad82e49d61faaeb599c6d46 (patch)
treee9d91fdd758767b4e092d087e24da40b6aa4c62c
parent61c5a67777a6f7639c9d2f36b14f7a903bdfc5a0 (diff)
downloadMultiMC-2fc18921b04536285ad82e49d61faaeb599c6d46.tar
MultiMC-2fc18921b04536285ad82e49d61faaeb599c6d46.tar.gz
MultiMC-2fc18921b04536285ad82e49d61faaeb599c6d46.tar.lz
MultiMC-2fc18921b04536285ad82e49d61faaeb599c6d46.tar.xz
MultiMC-2fc18921b04536285ad82e49d61faaeb599c6d46.zip
GH-1053 add launch step creation to legacy instances
-rw-r--r--logic/launch/steps/LaunchCommand.cpp2
-rw-r--r--logic/minecraft/LegacyInstance.cpp71
-rw-r--r--logic/minecraft/LegacyUpdate.cpp2
3 files changed, 67 insertions, 8 deletions
diff --git a/logic/launch/steps/LaunchCommand.cpp b/logic/launch/steps/LaunchCommand.cpp
index 8b133dea..2cbb3785 100644
--- a/logic/launch/steps/LaunchCommand.cpp
+++ b/logic/launch/steps/LaunchCommand.cpp
@@ -27,7 +27,7 @@ LaunchCommand::LaunchCommand(LaunchTask *parent) : LaunchStep(parent)
void LaunchCommand::executeTask()
{
auto instance = m_parent->instance();
- std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<OneSixInstance>(instance);
+ std::shared_ptr<MinecraftInstance> minecraftInstance = std::dynamic_pointer_cast<MinecraftInstance>(instance);
QStringList args = minecraftInstance->javaArguments();
QString allArgs = args.join(", ");
diff --git a/logic/minecraft/LegacyInstance.cpp b/logic/minecraft/LegacyInstance.cpp
index a0af19dc..4648ce59 100644
--- a/logic/minecraft/LegacyInstance.cpp
+++ b/logic/minecraft/LegacyInstance.cpp
@@ -25,6 +25,12 @@
#include "minecraft/LegacyUpdate.h"
#include "icons/IconList.h"
#include "launch/LaunchTask.h"
+#include <launch/steps/LaunchCommand.h>
+#include <launch/steps/PostLaunchCommand.h>
+#include <launch/steps/ModMinecraftJar.h>
+#include <launch/steps/Update.h>
+#include <launch/steps/PreLaunchCommand.h>
+#include <launch/steps/TextPrint.h>
#include "minecraft/ModList.h"
#include <MMCZip.h>
@@ -96,7 +102,7 @@ std::shared_ptr<Task> LegacyInstance::createUpdateTask()
return std::shared_ptr<Task>(new LegacyUpdate(this, this));
}
-std::shared_ptr<LaunchTask> LegacyInstance::createLaunchTask(AuthSessionPtr account)
+std::shared_ptr<LaunchTask> LegacyInstance::createLaunchTask(AuthSessionPtr session)
{
QString launchScript;
QIcon icon = ENV.icons()->getIcon(iconKey());
@@ -116,17 +122,70 @@ std::shared_ptr<LaunchTask> LegacyInstance::createLaunchTask(AuthSessionPtr acco
QString lwjgl = QDir(m_lwjglFolderSetting->get().toString() + "/" + lwjglVersion())
.absolutePath();
- launchScript += "userName " + account->player_name + "\n";
- launchScript += "sessionId " + account->session + "\n";
+ launchScript += "userName " + session->player_name + "\n";
+ launchScript += "sessionId " + session->session + "\n";
launchScript += "windowTitle " + windowTitle() + "\n";
launchScript += "windowParams " + windowParams + "\n";
launchScript += "lwjgl " + lwjgl + "\n";
launchScript += "launcher legacy\n";
}
auto process = LaunchTask::create(std::dynamic_pointer_cast<MinecraftInstance>(getSharedPtr()));
- // process->setLaunchScript(launchScript);
- // process->setWorkdir(minecraftRoot());
- // process->setLogin(account);
+ auto pptr = process.get();
+
+ // print a header
+ {
+ process->appendStep(std::make_shared<TextPrint>(pptr, "Minecraft folder is:\n" + minecraftRoot() + "\n\n", MessageLevel::MultiMC));
+ }
+ // run pre-launch command if that's needed
+ if(getPreLaunchCommand().size())
+ {
+ auto step = std::make_shared<PreLaunchCommand>(pptr);
+ step->setWorkingDirectory(minecraftRoot());
+ process->appendStep(step);
+ }
+ // if we aren't in offline mode,.
+ if(session->status != AuthSession::PlayableOffline)
+ {
+ process->appendStep(std::make_shared<Update>(pptr));
+ }
+ // if there are any jar mods
+ if(getJarMods().size())
+ {
+ auto step = std::make_shared<ModMinecraftJar>(pptr);
+ process->appendStep(step);
+ }
+ // actually launch the game
+ {
+ auto step = std::make_shared<LaunchCommand>(pptr);
+ step->setWorkingDirectory(minecraftRoot());
+ step->setLaunchScript(launchScript);
+ process->appendStep(step);
+ }
+ // run post-exit command if that's needed
+ if(getPostExitCommand().size())
+ {
+ auto step = std::make_shared<PostLaunchCommand>(pptr);
+ step->setWorkingDirectory(minecraftRoot());
+ process->appendStep(step);
+ }
+ if (session)
+ {
+ QMap<QString, QString> filter;
+ if (session->session != "-")
+ filter[session->session] = tr("<SESSION ID>");
+ filter[session->access_token] = tr("<ACCESS TOKEN>");
+ filter[session->client_token] = tr("<CLIENT TOKEN>");
+ filter[session->uuid] = tr("<PROFILE ID>");
+ filter[session->player_name] = tr("<PROFILE NAME>");
+
+ auto i = session->u.properties.begin();
+ while (i != session->u.properties.end())
+ {
+ filter[i.value()] = "<" + i.key().toUpper() + ">";
+ ++i;
+ }
+ process->setCensorFilter(filter);
+ }
return process;
}
diff --git a/logic/minecraft/LegacyUpdate.cpp b/logic/minecraft/LegacyUpdate.cpp
index 7ea20ad8..e136deec 100644
--- a/logic/minecraft/LegacyUpdate.cpp
+++ b/logic/minecraft/LegacyUpdate.cpp
@@ -326,7 +326,7 @@ void LegacyUpdate::extractLwjgl()
setStatus(tr("Installing new LWJGL - extracting ") + name + "...");
QFile output(destFileName);
output.open(QIODevice::WriteOnly);
- output.write(file.readAll()); // FIXME: wste of memory!?
+ output.write(file.readAll());
output.close();
}
file.close(); // do not forget to close!