summaryrefslogtreecommitdiffstats
path: root/api/logic
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2018-01-05 04:26:46 +0100
committerPetr Mrázek <peterix@gmail.com>2018-01-05 04:26:46 +0100
commit0636c03d7c08a90de5180e20dd6106c4cac34a23 (patch)
tree0e969118c1ae557dbdc2377452638ee9460f94a8 /api/logic
parentee341b78baf679ba7eac868ce72e313c8e49775f (diff)
downloadMultiMC-0636c03d7c08a90de5180e20dd6106c4cac34a23.tar
MultiMC-0636c03d7c08a90de5180e20dd6106c4cac34a23.tar.gz
MultiMC-0636c03d7c08a90de5180e20dd6106c4cac34a23.tar.lz
MultiMC-0636c03d7c08a90de5180e20dd6106c4cac34a23.tar.xz
MultiMC-0636c03d7c08a90de5180e20dd6106c4cac34a23.zip
GH-2087 remove the revert to vanilla functionality, add file download button to version page
Diffstat (limited to 'api/logic')
-rw-r--r--api/logic/minecraft/ComponentList.cpp36
-rw-r--r--api/logic/minecraft/ComponentList.h6
-rw-r--r--api/logic/minecraft/MinecraftInstance.cpp10
3 files changed, 2 insertions, 50 deletions
diff --git a/api/logic/minecraft/ComponentList.cpp b/api/logic/minecraft/ComponentList.cpp
index b4ab2151..dc7f3614 100644
--- a/api/logic/minecraft/ComponentList.cpp
+++ b/api/logic/minecraft/ComponentList.cpp
@@ -743,42 +743,6 @@ Component * ComponentList::getComponent(int index)
return d->components[index].get();
}
-bool ComponentList::isVanilla()
-{
- for(auto patchptr: d->components)
- {
- if(patchptr->isCustom())
- return false;
- }
- return true;
-}
-
-bool ComponentList::revertToVanilla()
-{
- // remove patches, if present
- auto VersionPatchesCopy = d->components;
- for(auto & it: VersionPatchesCopy)
- {
- if (!it->isCustom())
- {
- continue;
- }
- if(it->isRevertible() || it->isRemovable())
- {
- if(!remove(it->getID()))
- {
- qWarning() << "Couldn't remove" << it->getID() << "from profile!";
- invalidateLaunchProfile();
- scheduleSave();
- return false;
- }
- }
- }
- invalidateLaunchProfile();
- scheduleSave();
- return true;
-}
-
QVariant ComponentList::data(const QModelIndex &index, int role) const
{
if (!index.isValid())
diff --git a/api/logic/minecraft/ComponentList.h b/api/logic/minecraft/ComponentList.h
index 3b53a9fe..6d380fe9 100644
--- a/api/logic/minecraft/ComponentList.h
+++ b/api/logic/minecraft/ComponentList.h
@@ -59,12 +59,6 @@ public:
/// call this to explicitly mark the component list as loaded - this is used to build a new component list from scratch.
void buildingFromScratch();
- /// is this version unchanged by the user?
- bool isVanilla();
-
- /// remove any customizations on top of whatever 'vanilla' means
- bool revertToVanilla();
-
/// install more jar mods
void installJarMods(QStringList selectedFiles);
diff --git a/api/logic/minecraft/MinecraftInstance.cpp b/api/logic/minecraft/MinecraftInstance.cpp
index 49db5b75..2fda79bf 100644
--- a/api/logic/minecraft/MinecraftInstance.cpp
+++ b/api/logic/minecraft/MinecraftInstance.cpp
@@ -398,14 +398,8 @@ QStringList MinecraftInstance::processMinecraftArgs(AuthSessionPtr session) cons
// blatant self-promotion.
token_mapping["profile_name"] = token_mapping["version_name"] = "MultiMC5";
- if(m_components->isVanilla())
- {
- token_mapping["version_type"] = profile->getMinecraftVersionType();
- }
- else
- {
- token_mapping["version_type"] = "custom";
- }
+
+ token_mapping["version_type"] = profile->getMinecraftVersionType();
QString absRootDir = QDir(minecraftRoot()).absolutePath();
token_mapping["game_directory"] = absRootDir;