diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-08-12 00:39:19 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-08-12 00:39:19 +0200 |
| commit | ff33d4a1a48abf1442cde77c2253f071d0870d50 (patch) | |
| tree | 7846f144b2ee2e24574745847c0f921677021d73 /backend/OneSixInstance.cpp | |
| parent | 7e78a422e8bb22572706b7fadb58fc45e7b8a7db (diff) | |
| download | MultiMC-ff33d4a1a48abf1442cde77c2253f071d0870d50.tar MultiMC-ff33d4a1a48abf1442cde77c2253f071d0870d50.tar.gz MultiMC-ff33d4a1a48abf1442cde77c2253f071d0870d50.tar.lz MultiMC-ff33d4a1a48abf1442cde77c2253f071d0870d50.tar.xz MultiMC-ff33d4a1a48abf1442cde77c2253f071d0870d50.zip | |
OneSix instances now have a minecraft folder inside.
Also, the main instance view was expanded with helpful key events:
F2 for rename, F5 for refresh, Enter for start instance, Delete for...
Diffstat (limited to 'backend/OneSixInstance.cpp')
| -rw-r--r-- | backend/OneSixInstance.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/backend/OneSixInstance.cpp b/backend/OneSixInstance.cpp index bf8fd84e..46866b0e 100644 --- a/backend/OneSixInstance.cpp +++ b/backend/OneSixInstance.cpp @@ -70,7 +70,7 @@ QStringList OneSixInstance::processMinecraftArgs( QString user, QString session token_mapping["profile_name"] = name(); token_mapping["version_name"] = version->id; - QString absRootDir = QDir(rootDir()).absolutePath(); + QString absRootDir = QDir(minecraftRoot()).absolutePath(); token_mapping["game_directory"] = absRootDir; QString absAssetsDir = QDir("assets/").absolutePath(); token_mapping["game_assets"] = absAssetsDir; @@ -91,7 +91,7 @@ MinecraftProcess* OneSixInstance::prepareForLaunch ( QString user, QString sessi if(!version) return nullptr; auto libs_to_extract = version->getActiveNativeLibs(); - QString natives_dir_raw = PathCombine(rootDir(), "natives/"); + QString natives_dir_raw = PathCombine(instanceRoot(), "natives/"); bool success = ensurePathExists(natives_dir_raw); if(!success) { @@ -140,13 +140,13 @@ MinecraftProcess* OneSixInstance::prepareForLaunch ( QString user, QString sessi // create the process and set its parameters MinecraftProcess * proc = new MinecraftProcess(this); proc->setMinecraftArguments(args); - proc->setMinecraftWorkdir(rootDir()); + proc->setMinecraftWorkdir(minecraftRoot()); return proc; } void OneSixInstance::cleanupAfterRun() { - QString target_dir = PathCombine(rootDir(), "natives/"); + QString target_dir = PathCombine(instanceRoot(), "natives/"); QDir dir(target_dir); dir.removeRecursively(); } @@ -155,6 +155,7 @@ bool OneSixInstance::setIntendedVersionId ( QString version ) { settings().set("IntendedVersion", version); setShouldUpdate(true); + return true; } QString OneSixInstance::intendedVersionId() const @@ -187,7 +188,7 @@ bool OneSixInstance::reloadFullVersion() { I_D(OneSixInstance); - QString verpath = PathCombine(rootDir(), "version.json"); + QString verpath = PathCombine(instanceRoot(), "version.json"); QFile versionfile(verpath); if(versionfile.exists() && versionfile.open(QIODevice::ReadOnly)) { |