diff options
Diffstat (limited to 'logic/OneSixFTBInstance.cpp')
| -rw-r--r-- | logic/OneSixFTBInstance.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/logic/OneSixFTBInstance.cpp b/logic/OneSixFTBInstance.cpp index 172830bb..ef951987 100644 --- a/logic/OneSixFTBInstance.cpp +++ b/logic/OneSixFTBInstance.cpp @@ -1,12 +1,12 @@ #include "OneSixFTBInstance.h" -#include "VersionFinal.h" -#include "OneSixLibrary.h" +#include "logic/minecraft/InstanceVersion.h" +#include "logic/minecraft/OneSixLibrary.h" +#include "logic/minecraft/VersionBuilder.h" #include "tasks/SequentialTask.h" -#include "ForgeInstaller.h" -#include "lists/ForgeVersionList.h" +#include "forge/ForgeInstaller.h" +#include "forge/ForgeVersionList.h" #include "OneSixInstance_p.h" -#include "OneSixVersionBuilder.h" #include "MultiMC.h" #include "pathutils.h" @@ -100,6 +100,7 @@ QDir OneSixFTBInstance::librariesPath() const { return QDir(MMC->settings()->get("FTBRoot").toString() + "/libraries"); } + QDir OneSixFTBInstance::versionsPath() const { return QDir(MMC->settings()->get("FTBRoot").toString() + "/versions"); @@ -107,7 +108,6 @@ QDir OneSixFTBInstance::versionsPath() const QStringList OneSixFTBInstance::externalPatches() const { - I_D(OneSixInstance); return QStringList() << versionsPath().absoluteFilePath(intendedVersionId() + "/" + intendedVersionId() + ".json") << minecraftRoot() + "/pack.json"; } @@ -125,10 +125,6 @@ QString OneSixFTBInstance::getStatusbarDescription() } return "OneSix FTB: " + intendedVersionId(); } -bool OneSixFTBInstance::menuActionEnabled(QString action_name) const -{ - return false; -} std::shared_ptr<Task> OneSixFTBInstance::doUpdate() { |