diff options
Diffstat (limited to 'logic/minecraft')
| -rw-r--r-- | logic/minecraft/MinecraftInstance.cpp | 5 | ||||
| -rw-r--r-- | logic/minecraft/MinecraftProcess.cpp | 2 | ||||
| -rw-r--r-- | logic/minecraft/MinecraftVersion.cpp | 1 | ||||
| -rw-r--r-- | logic/minecraft/OneSixProfileStrategy.cpp | 6 |
4 files changed, 5 insertions, 9 deletions
diff --git a/logic/minecraft/MinecraftInstance.cpp b/logic/minecraft/MinecraftInstance.cpp index c7edaf82..11a29f04 100644 --- a/logic/minecraft/MinecraftInstance.cpp +++ b/logic/minecraft/MinecraftInstance.cpp @@ -1,7 +1,7 @@ #include "MinecraftInstance.h" -#include "MultiMC.h" #include "logic/settings/SettingsObject.h" #include <pathutils.h> +#include "logic/Env.h" #include "logic/minecraft/MinecraftVersionList.h" MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir) @@ -51,6 +51,5 @@ QString MinecraftInstance::minecraftRoot() const std::shared_ptr< BaseVersionList > MinecraftInstance::versionList() const { - return std::dynamic_pointer_cast<BaseVersionList>(MMC->minecraftlist()); + return ENV.getVersionList("net.minecraft"); } - diff --git a/logic/minecraft/MinecraftProcess.cpp b/logic/minecraft/MinecraftProcess.cpp index 97eb8ee8..e8682a50 100644 --- a/logic/minecraft/MinecraftProcess.cpp +++ b/logic/minecraft/MinecraftProcess.cpp @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "MultiMC.h" #include "BuildConfig.h" #include "logic/minecraft/MinecraftProcess.h" @@ -26,6 +25,7 @@ #include <QProcessEnvironment> #include <QRegularExpression> #include <QStandardPaths> +#include <QCoreApplication> #include "osutils.h" #include "pathutils.h" diff --git a/logic/minecraft/MinecraftVersion.cpp b/logic/minecraft/MinecraftVersion.cpp index 28afb5e7..0d484497 100644 --- a/logic/minecraft/MinecraftVersion.cpp +++ b/logic/minecraft/MinecraftVersion.cpp @@ -3,7 +3,6 @@ #include "VersionBuildError.h" #include "VersionBuilder.h" #include "ProfileUtils.h" -#include "MultiMC.h" #include "logic/settings/SettingsObject.h" bool MinecraftVersion::usesLegacyLauncher() diff --git a/logic/minecraft/OneSixProfileStrategy.cpp b/logic/minecraft/OneSixProfileStrategy.cpp index 285e983c..5c0658d0 100644 --- a/logic/minecraft/OneSixProfileStrategy.cpp +++ b/logic/minecraft/OneSixProfileStrategy.cpp @@ -2,8 +2,7 @@ #include "logic/minecraft/VersionBuildError.h" #include "logic/OneSixInstance.h" #include "logic/minecraft/MinecraftVersionList.h" - -#include "MultiMC.h" +#include "logic/Env.h" #include <pathutils.h> #include <QDir> @@ -73,8 +72,7 @@ void OneSixProfileStrategy::loadDefaultBuiltinPatches() } else { - auto minecraftList = MMC->minecraftlist(); - auto mcversion = minecraftList->findVersion(m_instance->intendedVersionId()); + auto mcversion = ENV.getVersion("net.minecraft", m_instance->intendedVersionId()); minecraftPatch = std::dynamic_pointer_cast<ProfilePatch>(mcversion); } if (!minecraftPatch) |