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

NOISSUE preview of LWJGL version changing

Browse Source 
It still needs work - some LWJGL versions are exclusive to macOS.
This has to be encoded in the json.
This commit is contained in:
Petr Mrázek
2017-03-30 01:05:58 +02:00
parent 53188386b8
commit 2ac0edbbdb
10 changed files with 143 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
api/logic/minecraft/onesix/OneSixInstance.cpp
View File

@ -35,6 +35,7 @@ OneSixInstance::OneSixInstance(SettingsObjectPtr globalSettings, SettingsObjectP
: MinecraftInstance(globalSettings, settings, rootDir)
{
m_settings->registerSetting({"IntendedVersion", "MinecraftVersion"}, "");
m_settings->registerSetting("LWJGLVersion", "");
}
void OneSixInstance::init()
@ -480,7 +481,24 @@ std::shared_ptr<WorldList> OneSixInstance::worldList() const
bool OneSixInstance::setIntendedVersionId(QString version)
{
settings()->set("IntendedVersion", version);
return setComponentVersion("net.minecraft", version);
}
QString OneSixInstance::intendedVersionId() const
{
return getComponentVersion("net.minecraft");
}
bool OneSixInstance::setComponentVersion(const QString& uid, const QString& version)
{
if(uid == "net.minecraft")
{
settings()->set("IntendedVersion", version);
}
else if (uid == "org.lwjgl")
{
settings()->set("LWJGLVersion", version);
}
if(getMinecraftProfile())
{
clearProfile();
@ -489,6 +507,24 @@ bool OneSixInstance::setIntendedVersionId(QString version)
return true;
}
QString OneSixInstance::getComponentVersion(const QString& uid) const
{
if(uid == "net.minecraft")
{
return settings()->get("IntendedVersion").toString();
}
else if(uid == "org.lwjgl")
{
auto version = settings()->get("LWJGLVersion").toString();
if(version.isEmpty())
{
return "2.9.1";
}
return version;
}
return QString();
}
QList< Mod > OneSixInstance::getJarMods() const
{
QList<Mod> mods;
@ -500,12 +536,6 @@ QList< Mod > OneSixInstance::getJarMods() const
return mods;
}
QString OneSixInstance::intendedVersionId() const
{
return settings()->get("IntendedVersion").toString();
}
void OneSixInstance::setShouldUpdate(bool)
{
}

4
api/logic/minecraft/onesix/OneSixInstance.h
View File

@ -59,9 +59,11 @@ public:
virtual QString intendedVersionId() const override;
virtual bool setIntendedVersionId(QString version) override;
virtual QString currentVersionId() const override;
QString getComponentVersion(const QString &uid) const;
bool setComponentVersion(const QString &uid, const QString &version);
virtual bool shouldUpdate() const override;
virtual void setShouldUpdate(bool val) override;

4
api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
View File

@ -114,8 +114,8 @@ void OneSixProfileStrategy::loadDefaultBuiltinPatches()
profilePatch->setOrder(order);
profile->appendPatch(profilePatch);
};
addBuiltinPatch("net.minecraft", m_instance->intendedVersionId(), -2);
addBuiltinPatch("org.lwjgl", "2.9.1", -1);
addBuiltinPatch("net.minecraft", m_instance->getComponentVersion("net.minecraft"), -2);
addBuiltinPatch("org.lwjgl", m_instance->getComponentVersion("org.lwjgl"), -1);
}
void OneSixProfileStrategy::loadUserPatches()

4
api/logic/minecraft/onesix/OneSixUpdate.cpp
View File

@ -61,8 +61,8 @@ OneSixUpdate::OneSixUpdate(OneSixInstance *inst, QObject *parent) : Task(parent)
m_tasks.append(task.unwrap());
}
};
loadVersion("org.lwjgl", "2.9.1");
loadVersion("net.minecraft", m_inst->intendedVersionId());
loadVersion("org.lwjgl", m_inst->getComponentVersion("org.lwjgl"));
loadVersion("net.minecraft", m_inst->getComponentVersion("net.minecraft"));
}
// libraries download