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

NOISSUE handle recommended versions better

Browse Source 
Moved constants to the version data file
Use recommended Minecraft instead of latest stable for new instances by default
This commit is contained in:
Petr Mrázek
2015-05-02 12:44:37 +02:00
parent bb01c91469
commit 4fc4a17256
8 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
logic/minecraft/MinecraftVersionList.cpp
View File

@ -364,7 +364,7 @@ QVariant MinecraftVersionList::data(const QModelIndex& index, int role) const
return version->descriptor();
case RecommendedRole:
return version->descriptor() == "1.7.10";
return version->descriptor() == g_VersionFilterData.recommendedMinecraftVersion;
case TypeRole:
return version->typeString();
@ -386,6 +386,19 @@ BaseVersionPtr MinecraftVersionList::getLatestStable() const
return BaseVersionPtr();
}
BaseVersionPtr MinecraftVersionList::getRecommended() const
{
for(auto item: m_vlist)
{
auto version = std::dynamic_pointer_cast<MinecraftVersion>(item);
if(version->descriptor() == g_VersionFilterData.recommendedMinecraftVersion)
{
return item;
}
}
return getLatestStable();
}
void MinecraftVersionList::updateListData(QList<BaseVersionPtr> versions)
{
beginResetModel();

3
logic/minecraft/MinecraftVersionList.h
View File

@ -53,7 +53,8 @@ public:
virtual QVariant data(const QModelIndex & index, int role) const;
virtual RoleList providesRoles();
virtual BaseVersionPtr getLatestStable() const;
virtual BaseVersionPtr getLatestStable() const override;
virtual BaseVersionPtr getRecommended() const override;
protected:
QList<BaseVersionPtr> m_vlist;

4
logic/minecraft/VersionFilterData.cpp
View File

@ -69,4 +69,8 @@ VersionFilterData::VersionFilterData()
QSet<QString>{"net.java.jinput:jinput", "net.java.jinput:jinput-platform",
"net.java.jutils:jutils", "org.lwjgl.lwjgl:lwjgl",
"org.lwjgl.lwjgl:lwjgl_util", "org.lwjgl.lwjgl:lwjgl-platform"};
// Version list magic
recommendedMinecraftVersion = "1.7.10";
discouragedJavaVersion = "1.9.0";
}

4
logic/minecraft/VersionFilterData.h
View File

@ -24,5 +24,9 @@ struct VersionFilterData
QDateTime legacyCutoffDate;
// Libraries that belong to LWJGL
QSet<QString> lwjglWhitelist;
// Currently recommended minecraft version
QString recommendedMinecraftVersion;
// Currently discouraged java version (anything equal and above will be discouraged)
QString discouragedJavaVersion;
};
extern VersionFilterData g_VersionFilterData;