diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-04-23 02:31:13 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-04-23 02:34:16 +0200 |
| commit | 3f24c4cfe5afe47eb8ce6f0201b9099e4e50e8ba (patch) | |
| tree | 298901b19ddf1bd645690bfe1d918d0c20e69780 /api/logic/minecraft/onesix | |
| parent | b414bbe395d8056365368fde823535fdde398e4c (diff) | |
| download | PrismLauncher-3f24c4cfe5afe47eb8ce6f0201b9099e4e50e8ba.tar.gz PrismLauncher-3f24c4cfe5afe47eb8ce6f0201b9099e4e50e8ba.tar.bz2 PrismLauncher-3f24c4cfe5afe47eb8ce6f0201b9099e4e50e8ba.zip | |
GH-1856 Make MultiMC fail hard when things are missing
Things like:
* jar mods
* valid version files
Diffstat (limited to 'api/logic/minecraft/onesix')
| -rw-r--r-- | api/logic/minecraft/onesix/OneSixInstance.cpp | 1 | ||||
| -rw-r--r-- | api/logic/minecraft/onesix/OneSixProfileStrategy.cpp | 15 | ||||
| -rw-r--r-- | api/logic/minecraft/onesix/OneSixVersionFormat.cpp | 1 |
3 files changed, 2 insertions, 15 deletions
diff --git a/api/logic/minecraft/onesix/OneSixInstance.cpp b/api/logic/minecraft/onesix/OneSixInstance.cpp index 7e4e97b7..ecfd0647 100644 --- a/api/logic/minecraft/onesix/OneSixInstance.cpp +++ b/api/logic/minecraft/onesix/OneSixInstance.cpp @@ -23,7 +23,6 @@ #include "OneSixProfileStrategy.h" #include "minecraft/MinecraftProfile.h" -#include "minecraft/VersionBuildError.h" #include "minecraft/launch/ModMinecraftJar.h" #include "MMCZip.h" diff --git a/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp b/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp index b4be3356..0b83c2e1 100644 --- a/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp +++ b/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp @@ -2,7 +2,6 @@ #include "OneSixInstance.h" #include "OneSixVersionFormat.h" -#include "minecraft/VersionBuildError.h" #include "Env.h" #include <FileSystem.h> @@ -107,10 +106,6 @@ void OneSixProfileStrategy::loadDefaultBuiltinPatches() profilePatch = std::make_shared<ProfilePatch>(metaVersion); profilePatch->setVanilla(true); } - if (!profilePatch) - { - throw VersionIncomplete(uid); - } profilePatch->setOrder(order); profile->appendPatch(profilePatch); }; @@ -291,6 +286,7 @@ bool OneSixProfileStrategy::customizePatch(ProfilePatchPtr patch) { return false; } + // FIXME: get rid of this try-catch. try { QSaveFile jsonFile(filename); @@ -311,10 +307,6 @@ bool OneSixProfileStrategy::customizePatch(ProfilePatchPtr patch) } load(); } - catch (VersionIncomplete &error) - { - qDebug() << "Version was incomplete:" << error.cause(); - } catch (Exception &error) { qWarning() << "Version could not be loaded:" << error.cause(); @@ -337,14 +329,11 @@ bool OneSixProfileStrategy::revertPatch(ProfilePatchPtr patch) } // just kill the file and reload bool result = QFile::remove(filename); + // FIXME: get rid of this try-catch. try { load(); } - catch (VersionIncomplete &error) - { - qDebug() << "Version was incomplete:" << error.cause(); - } catch (Exception &error) { qWarning() << "Version could not be loaded:" << error.cause(); diff --git a/api/logic/minecraft/onesix/OneSixVersionFormat.cpp b/api/logic/minecraft/onesix/OneSixVersionFormat.cpp index 632bf2d9..7ebf514f 100644 --- a/api/logic/minecraft/onesix/OneSixVersionFormat.cpp +++ b/api/logic/minecraft/onesix/OneSixVersionFormat.cpp @@ -1,7 +1,6 @@ #include "OneSixVersionFormat.h" #include <Json.h> #include "minecraft/ParseUtils.h" -#include <minecraft/VersionBuildError.h> #include <minecraft/MojangVersionFormat.h> using namespace Json; |