ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix merge issues

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-06-16 00:31:31 +03:00
parent c01f3107a4
commit 5fbbdb9707
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
3 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/minecraft/mod/TexturePackFolderModel.cpp
View File

@ -37,7 +37,6 @@
#include "Application.h" #include "Application.h"
#include "StringUtils.h"
#include "TexturePackFolderModel.h" #include "TexturePackFolderModel.h"
#include "minecraft/mod/tasks/BasicFolderLoadTask.h" #include "minecraft/mod/tasks/BasicFolderLoadTask.h"

42
launcher/ui/pages/modplatform/ModPage.cpp
View File

@ -113,48 +113,6 @@ QMap<QString, QString> ModPage::urlHandlers() const
/******** Make changes to the UI ********/ /******** Make changes to the UI ********/
void ModPage::updateVersionList()
{
m_ui->versionSelectionBox->clear();
auto packProfile = (dynamic_cast<MinecraftInstance&>(m_base_instance)).getPackProfile();
QString mcVersion = packProfile->getComponentVersion("net.minecraft");
auto current_pack = getCurrentPack();
if (!current_pack)
return;
auto installedVersion = m_model->getInstalledPackVersion(current_pack);
auto installedIndex = -1;
for (int i = 0; i < current_pack->versions.size(); i++) {
auto version = current_pack->versions[i];
bool valid = false;
for (auto& mcVer : m_filter->versions) {
if (validateVersion(version, mcVer.toString(), packProfile->getSupportedModLoaders())) {
valid = true;
break;
}
}
QString flag;
if (installedIndex == -1 && installedVersion.isValid() && installedVersion == version.fileId) {
flag = QString(" [%1]").arg(tr("installed", "Mod version select box"));
installedIndex = i;
}
// Only add the version if it's valid or using the 'Any' filter, but never if the version is opted out
if ((valid || m_filter->versions.empty()) && !optedOut(version)) {
auto release_type = version.version_type.isValid() ? QString(" [%1]").arg(version.version_type.toString()) : "";
m_ui->versionSelectionBox->addItem(QString("%1%2%3").arg(version.version, release_type, flag), QVariant(i));
}
}
if (installedIndex != -1)
m_ui->versionSelectionBox->setCurrentIndex(installedIndex);
if (m_ui->versionSelectionBox->count() == 0) {
m_ui->versionSelectionBox->addItem(tr("No valid version found!"), QVariant(-1));
m_ui->resourceSelectionButton->setText(tr("Cannot select invalid version :("));
}
updateSelectionButton();
}
void ModPage::addResourceToPage(ModPlatform::IndexedPack::Ptr pack, void ModPage::addResourceToPage(ModPlatform::IndexedPack::Ptr pack,
ModPlatform::IndexedVersion& version, ModPlatform::IndexedVersion& version,
const std::shared_ptr<ResourceFolderModel> base_model) const std::shared_ptr<ResourceFolderModel> base_model)

1
launcher/ui/pages/modplatform/ResourcePage.cpp
View File

@ -449,7 +449,6 @@ void ResourcePage::openUrl(const QUrl& url)
void ResourcePage::openProject(QVariant projectID) void ResourcePage::openProject(QVariant projectID)
{ {
m_ui->sortByBox->hide(); m_ui->sortByBox->hide();
m_ui->searchButton->hide();
m_ui->searchEdit->hide(); m_ui->searchEdit->hide();
m_ui->resourceFilterButton->hide(); m_ui->resourceFilterButton->hide();
m_ui->packView->hide(); m_ui->packView->hide();