CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCRATCH remove remaining references to MultiMC.h and fix legacy LWJGL

Browse Source
This commit is contained in:
Petr Mrázek
2015-02-02 01:09:28 +01:00
parent 382ae78a0b
commit d313e9ab09
28 changed files with 209 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
logic/minecraft/MinecraftInstance.cpp
View File

@ -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");
}

2
logic/minecraft/MinecraftProcess.cpp
View File

@ -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"

1
logic/minecraft/MinecraftVersion.cpp
View File

@ -3,7 +3,6 @@
#include "VersionBuildError.h"
#include "VersionBuilder.h"
#include "ProfileUtils.h"
#include "MultiMC.h"
#include "logic/settings/SettingsObject.h"
bool MinecraftVersion::usesLegacyLauncher()

6
logic/minecraft/OneSixProfileStrategy.cpp
View File

@ -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)