diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-07-23 13:41:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 13:41:23 +0200 |
| commit | b902c5cd7814f286a8b850762dc39a6d654300d2 (patch) | |
| tree | d64c81c76c364ec5f23b7e42ea234a6e8e821dbb | |
| parent | 78124f6fba23dc19d6e08f70afec1365b738c02c (diff) | |
| parent | 211cfb4af785f2084c8d274eabf33551bb7c8643 (diff) | |
| download | PrismLauncher-b902c5cd7814f286a8b850762dc39a6d654300d2.tar.gz PrismLauncher-b902c5cd7814f286a8b850762dc39a6d654300d2.tar.bz2 PrismLauncher-b902c5cd7814f286a8b850762dc39a6d654300d2.zip | |
Merge pull request #3956 from jamierocks/block-forge-117-install
NOISSUE Disable Install Forge button on 1.17 (and above)
| -rw-r--r-- | api/logic/minecraft/OneSixVersionFormat.cpp | 3 | ||||
| -rw-r--r-- | application/pages/instance/VersionPage.cpp | 16 |
2 files changed, 11 insertions, 8 deletions
diff --git a/api/logic/minecraft/OneSixVersionFormat.cpp b/api/logic/minecraft/OneSixVersionFormat.cpp index d6aaa790..0329d70e 100644 --- a/api/logic/minecraft/OneSixVersionFormat.cpp +++ b/api/logic/minecraft/OneSixVersionFormat.cpp @@ -194,8 +194,7 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc LibDLInfo->artifact = out->mojangDownloads["client"]; lib->setMojangDownloadInfo(LibDLInfo); } - // we got nothing... guess based on ancient hardcoded Mojang behaviour - // FIXME: this will eventually break... + // we got nothing... else { out->addProblem( diff --git a/application/pages/instance/VersionPage.cpp b/application/pages/instance/VersionPage.cpp index eff12c9c..a98bfb7d 100644 --- a/application/pages/instance/VersionPage.cpp +++ b/application/pages/instance/VersionPage.cpp @@ -212,12 +212,16 @@ void VersionPage::updateVersionControls() { // FIXME: this is a dirty hack auto minecraftVersion = Version(m_profile->getComponentVersion("net.minecraft")); - bool newCraft = minecraftVersion >= Version("1.14"); - bool oldCraft = minecraftVersion <= Version("1.12.2"); - ui->actionInstall_Fabric->setEnabled(controlsEnabled && newCraft); - ui->actionInstall_Forge->setEnabled(controlsEnabled); - ui->actionInstall_LiteLoader->setEnabled(controlsEnabled && oldCraft); - ui->actionReload->setEnabled(true); + + bool supportsFabric = minecraftVersion >= Version("1.14"); + ui->actionInstall_Fabric->setEnabled(controlsEnabled && supportsFabric); + + bool supportsForge = minecraftVersion <= Version("1.16.5"); + ui->actionInstall_Forge->setEnabled(controlsEnabled && supportsForge); + + bool supportsLiteLoader = minecraftVersion <= Version("1.12.2"); + ui->actionInstall_LiteLoader->setEnabled(controlsEnabled && supportsLiteLoader); + updateButtons(); } |