diff options
Diffstat (limited to 'libmultimc/src')
| -rw-r--r-- | libmultimc/src/appsettings.cpp | 3 | ||||
| -rw-r--r-- | libmultimc/src/instance.cpp | 24 | ||||
| -rw-r--r-- | libmultimc/src/instancelist.cpp | 2 | ||||
| -rw-r--r-- | libmultimc/src/logintask.cpp | 22 |
4 files changed, 36 insertions, 15 deletions
diff --git a/libmultimc/src/appsettings.cpp b/libmultimc/src/appsettings.cpp index 68d2c015..7c886fdb 100644 --- a/libmultimc/src/appsettings.cpp +++ b/libmultimc/src/appsettings.cpp @@ -18,10 +18,11 @@ #include <setting.h> #include <QPoint> +#include <QApplication> //#include <QColor> AppSettings::AppSettings(QObject *parent) : - BasicSettingsObject(parent) + INISettingsObject(QApplication::applicationDirPath() + "/multimc.cfg",parent) { // Updates registerSetting(new Setting("UseDevBuilds", false)); diff --git a/libmultimc/src/instance.cpp b/libmultimc/src/instance.cpp index 377acd32..1af359d1 100644 --- a/libmultimc/src/instance.cpp +++ b/libmultimc/src/instance.cpp @@ -27,7 +27,7 @@ Instance::Instance(const QString &rootDir, QObject *parent) : QObject(parent) { m_rootDir = rootDir; - m_settings = new INISettingsObject(PathCombine(rootDir, "instance.cfg"), this); + m_settings = new INISettingsObject(configFile(), this); settings().registerSetting(new Setting("name", "Unnamed Instance")); settings().registerSetting(new Setting("iconKey", "default")); @@ -82,7 +82,12 @@ QString Instance::minecraftDir() const if (dotMCDir.exists() && !mcDir.exists()) return dotMCDir.filePath(); else - return mcDir.filePath(); + return mcDir.filePath(); +} + +QString Instance::instModsDir() const +{ + return PathCombine(rootDir(), "instMods"); } QString Instance::binDir() const @@ -125,6 +130,21 @@ QString Instance::mcJar() const return PathCombine(binDir(), "minecraft.jar"); } +QString Instance::mcBackup() const +{ + return PathCombine(binDir(), "mcbackup.jar"); +} + +QString Instance::configFile() const +{ + return PathCombine(rootDir(), "instance.cfg"); +} + +QString Instance::modListFile() const +{ + return PathCombine(rootDir(), "modlist"); +} + SettingsObject &Instance::settings() const { return *m_settings; diff --git a/libmultimc/src/instancelist.cpp b/libmultimc/src/instancelist.cpp index 3b0b668f..78650634 100644 --- a/libmultimc/src/instancelist.cpp +++ b/libmultimc/src/instancelist.cpp @@ -28,7 +28,7 @@ InstanceList::InstanceList(const QString &instDir, QObject *parent) : - QObject(parent), m_instDir(instDir) + QObject(parent), m_instDir("instances") { } diff --git a/libmultimc/src/logintask.cpp b/libmultimc/src/logintask.cpp index 71075630..e042a93f 100644 --- a/libmultimc/src/logintask.cpp +++ b/libmultimc/src/logintask.cpp @@ -24,8 +24,8 @@ #include <QUrl> #include <QUrlQuery> -LoginTask::LoginTask(const UserInfo &uInfo, QObject *parent) : - Task(parent), uInfo(uInfo) +LoginTask::LoginTask( const UserInfo& uInfo, QString inst, QObject* parent ) : + Task(parent), uInfo(uInfo), inst(inst) { } @@ -78,42 +78,42 @@ void LoginTask::processNetReply(QNetworkReply *reply) QString sessionID = strings[3]; LoginResponse response(username, sessionID, latestVersion); - emit loginComplete(response); + emit loginComplete(inst, response); } else { - emit loginFailed("Failed to parse Minecraft version string."); + emit loginFailed(inst, "Failed to parse Minecraft version string."); } } else { if (responseStr.toLower() == "bad login") - emit loginFailed("Invalid username or password."); + emit loginFailed(inst, "Invalid username or password."); else if (responseStr.toLower() == "old version") - emit loginFailed("Launcher outdated, please update."); + emit loginFailed(inst, "Launcher outdated, please update."); else - emit loginFailed("Login failed: " + responseStr); + emit loginFailed(inst, "Login failed: " + responseStr); } } else if (responseCode == 503) { - emit loginFailed("The login servers are currently unavailable. " + emit loginFailed(inst, "The login servers are currently unavailable. " "Check http://help.mojang.com/ for more info."); } else { - emit loginFailed(QString("Login failed: Unknown HTTP error %1 occurred."). + emit loginFailed(inst, QString("Login failed: Unknown HTTP error %1 occurred."). arg(QString::number(responseCode))); } break; } case QNetworkReply::OperationCanceledError: - emit loginFailed("Login canceled."); + emit loginFailed(inst, "Login canceled."); break; default: - emit loginFailed("Login failed: " + reply->errorString()); + emit loginFailed(inst, "Login failed: " + reply->errorString()); break; } |