AstralTransRocketries/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-08-03 11:27:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove central mods

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2025-08-03 14:39:22 +01:00
parent 79b7e277f1
commit 7d9f147dcc
No known key found for this signature in database
GPG Key ID: 5E39D70B4C93C38E
11 changed files with 7 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/Application.cpp
View File

@ -703,7 +703,6 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
// Folders
m_settings->registerSetting("InstanceDir", "instances");
m_settings->registerSetting({ "CentralModsDir", "ModsDir" }, "mods");
m_settings->registerSetting("IconsDir", "icons");
m_settings->registerSetting("DownloadsDir", QStandardPaths::writableLocation(QStandardPaths::DownloadLocation));
m_settings->registerSetting("DownloadsDirWatchRecursive", false);

5
launcher/ui/MainWindow.cpp
View File

@ -1220,11 +1220,6 @@ void MainWindow::on_actionViewInstanceFolder_triggered()
DesktopServices::openPath(str);
}
void MainWindow::on_actionViewCentralModsFolder_triggered()
{
DesktopServices::openPath(APPLICATION->settings()->get("CentralModsDir").toString(), true);
}
void MainWindow::on_actionViewSkinsFolder_triggered()
{
DesktopServices::openPath(APPLICATION->settings()->get("SkinsDir").toString(), true);

1
launcher/ui/MainWindow.h
View File

@ -111,7 +111,6 @@ class MainWindow : public QMainWindow {
void on_actionViewLauncherRootFolder_triggered();
void on_actionViewInstanceFolder_triggered();
void on_actionViewCentralModsFolder_triggered();
void on_actionViewIconThemeFolder_triggered();
void on_actionViewWidgetThemeFolder_triggered();

12
launcher/ui/MainWindow.ui
View File

@ -190,7 +190,6 @@
<addaction name="actionViewLauncherRootFolder"/>
<addaction name="separator"/>
<addaction name="actionViewInstanceFolder"/>
<addaction name="actionViewCentralModsFolder"/>
<addaction name="actionViewSkinsFolder"/>
<addaction name="actionViewJavaFolder"/>
<addaction name="separator"/>
@ -545,17 +544,6 @@
<string>Open the launcher's root folder in a file browser.</string>
</property>
</action>
<action name="actionViewCentralModsFolder">
<property name="icon">
<iconset theme="centralmods"/>
</property>
<property name="text">
<string>&amp;Central Mods</string>
</property>
<property name="toolTip">
<string>Open the central mods folder in a file browser.</string>
</property>
</action>
<action name="actionViewSkinsFolder">
<property name="icon">
<iconset theme="viewfolder"/>

4
launcher/ui/dialogs/BlockedModsDialog.cpp
View File

@ -189,14 +189,12 @@ void BlockedModsDialog::directoryChanged(QString path)
scanPath(path, true);
}
/// @brief add the user downloads folder and the global mods folder to the filesystem watcher
/// @brief add the user downloads folder to the filesystem watcher
void BlockedModsDialog::setupWatch()
{
const QString downloadsFolder = APPLICATION->settings()->get("DownloadsDir").toString();
const QString modsFolder = APPLICATION->settings()->get("CentralModsDir").toString();
const bool downloadsFolderWatchRecursive = APPLICATION->settings()->get("DownloadsDirWatchRecursive").toBool();
watchPath(downloadsFolder, downloadsFolderWatchRecursive);
watchPath(modsFolder, true);
}
void BlockedModsDialog::watchPath(QString path, bool watch_recursive)

2
launcher/ui/dialogs/BlockedModsDialog.ui
View File

@ -42,7 +42,7 @@
<item>
<widget class="QLabel" name="labelExplain">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your configured global mods folder and default downloads folder are automatically checked for the downloaded mods and they will be copied to the instance if found.&lt;/p&gt;&lt;p&gt;Optionally, you may drag and drop the downloaded mods onto this dialog or add a folder to watch if you did not download the mods to a default location.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Click 'Open Missing' to open all the download links in the browser. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Your configured download folder is automatically checked for the downloaded mods and they will be copied to the instance if found.&lt;/p&gt;&lt;p&gt;Optionally, you may drag and drop the downloaded mods onto this dialog or add a folder to watch if you did not download the mods to a default location.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Click 'Open Missing' to open all the download links in the browser. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>

13
launcher/ui/pages/global/LauncherPage.cpp
View File

@ -151,17 +151,6 @@ void LauncherPage::on_iconsDirBrowseBtn_clicked()
}
}
void LauncherPage::on_modsDirBrowseBtn_clicked()
{
QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Mods Folder"), ui->modsDirTextBox->text());
// do not allow current dir - it's dirty. Do not allow dirs that don't exist
if (!raw_dir.isEmpty() && QDir(raw_dir).exists()) {
QString cooked_dir = FS::NormalizePath(raw_dir);
ui->modsDirTextBox->setText(cooked_dir);
}
}
void LauncherPage::on_downloadsDirBrowseBtn_clicked()
{
QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Downloads Folder"), ui->downloadsDirTextBox->text());
@ -222,7 +211,6 @@ void LauncherPage::applySettings()
// Folders
// TODO: Offer to move instances to new instance folder.
s->set("InstanceDir", ui->instDirTextBox->text());
s->set("CentralModsDir", ui->modsDirTextBox->text());
s->set("IconsDir", ui->iconsDirTextBox->text());
s->set("DownloadsDir", ui->downloadsDirTextBox->text());
s->set("SkinsDir", ui->skinsDirTextBox->text());
@ -283,7 +271,6 @@ void LauncherPage::loadSettings()
// Folders
ui->instDirTextBox->setText(s->get("InstanceDir").toString());
ui->modsDirTextBox->setText(s->get("CentralModsDir").toString());
ui->iconsDirTextBox->setText(s->get("IconsDir").toString());
ui->downloadsDirTextBox->setText(s->get("DownloadsDir").toString());
ui->skinsDirTextBox->setText(s->get("SkinsDir").toString());

1
launcher/ui/pages/global/LauncherPage.h
View File

@ -70,7 +70,6 @@ class LauncherPage : public QWidget, public BasePage {
private slots:
void on_instDirBrowseBtn_clicked();
void on_modsDirBrowseBtn_clicked();
void on_iconsDirBrowseBtn_clicked();
void on_downloadsDirBrowseBtn_clicked();
void on_javaDirBrowseBtn_clicked();

22
launcher/ui/pages/global/LauncherPage.ui
View File

@ -271,16 +271,6 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelModsDir">
<property name="text">
<string>&amp;Mods:</string>
</property>
<property name="buddy">
<cstring>modsDirTextBox</cstring>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QPushButton" name="javaDirBrowseBtn">
<property name="text">
@ -301,9 +291,6 @@
<item row="5" column="1">
<widget class="QLineEdit" name="downloadsDirTextBox"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="modsDirTextBox"/>
</item>
<item row="0" column="0">
<widget class="QLabel" name="labelInstDir">
<property name="text">
@ -331,13 +318,6 @@
<item row="0" column="1">
<widget class="QLineEdit" name="instDirTextBox"/>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="modsDirBrowseBtn">
<property name="text">
<string>Browse</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="javaDirTextBox"/>
</item>
@ -644,8 +624,6 @@
<tabstop>updateIntervalSpinBox</tabstop>
<tabstop>instDirTextBox</tabstop>
<tabstop>instDirBrowseBtn</tabstop>
<tabstop>modsDirTextBox</tabstop>
<tabstop>modsDirBrowseBtn</tabstop>
<tabstop>iconsDirTextBox</tabstop>
<tabstop>iconsDirBrowseBtn</tabstop>
<tabstop>javaDirTextBox</tabstop>

2
launcher/ui/pages/instance/ExternalResourcesPage.cpp
View File

@ -211,7 +211,7 @@ void ExternalResourcesPage::addItem()
{
auto list = GuiUtil::BrowseForFiles(
helpPage(), tr("Select %1", "Select whatever type of files the page contains. Example: 'Loader Mods'").arg(displayName()),
m_fileSelectionFilter.arg(displayName()), APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
m_fileSelectionFilter.arg(displayName()), APPLICATION->settings()->get("DownloadsDir").toString(), this->parentWidget());
if (!list.isEmpty()) {
for (auto filename : list) {

8
launcher/ui/pages/instance/VersionPage.cpp
View File

@ -300,7 +300,7 @@ void VersionPage::on_actionRemove_triggered()
void VersionPage::on_actionAdd_to_Minecraft_jar_triggered()
{
auto list = GuiUtil::BrowseForFiles("jarmod", tr("Select jar mods"), tr("Minecraft.jar mods") + " (*.zip *.jar)",
APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
APPLICATION->settings()->get("DownloadsDir").toString(), this->parentWidget());
if (!list.empty()) {
m_profile->installJarMods(list);
}
@ -310,7 +310,7 @@ void VersionPage::on_actionAdd_to_Minecraft_jar_triggered()
void VersionPage::on_actionReplace_Minecraft_jar_triggered()
{
auto jarPath = GuiUtil::BrowseForFile("jar", tr("Select jar"), tr("Minecraft.jar replacement") + " (*.jar)",
APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
APPLICATION->settings()->get("DownloadsDir").toString(), this->parentWidget());
if (!jarPath.isEmpty()) {
m_profile->installCustomJar(jarPath);
}
@ -320,7 +320,7 @@ void VersionPage::on_actionReplace_Minecraft_jar_triggered()
void VersionPage::on_actionImport_Components_triggered()
{
QStringList list = GuiUtil::BrowseForFiles("component", tr("Select components"), tr("Components") + " (*.json)",
APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
APPLICATION->settings()->get("DownloadsDir").toString(), this->parentWidget());
if (!list.isEmpty()) {
if (!m_profile->installComponents(list)) {
@ -335,7 +335,7 @@ void VersionPage::on_actionImport_Components_triggered()
void VersionPage::on_actionAdd_Agents_triggered()
{
QStringList list = GuiUtil::BrowseForFiles("agent", tr("Select agents"), tr("Java agents") + " (*.jar)",
APPLICATION->settings()->get("CentralModsDir").toString(), this->parentWidget());
APPLICATION->settings()->get("DownloadsDir").toString(), this->parentWidget());
if (!list.isEmpty())
m_profile->installAgents(list);