remove drm

remove dbus support
Add Ornithe, LegacyFabric and Rift mod loader filters (#4041 )
2025-08-12 09:08:42 +05:00 · 2025-08-12 09:08:42 +05:00 · 2025-08-11 23:14:20 +01:00 · 2025-08-11 07:34:32 +02:00 · 2025-08-11 07:33:59 +02:00 · 2025-08-10 00:32:11 +00:00
14 changed files with 72 additions and 39 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -25,7 +25,7 @@ jobs:
          submodules: "true"
          path: "PrismLauncher-source"
      - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
      - name: Grab and store version
        run: |
          tag_name=$(echo ${{ github.ref }} | grep -oE "[^/]+$")
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -324,8 +324,6 @@ include(QtVersionlessBackport)
 if(Launcher_QT_VERSION_MAJOR EQUAL 6)
    set(QT_VERSION_MAJOR 6)
    find_package(Qt6 REQUIRED COMPONENTS Core CoreTools Widgets Concurrent Network Test Xml Core5Compat NetworkAuth OpenGL)
-    find_package(Qt6 COMPONENTS DBus)
-    list(APPEND Launcher_QT_DBUS Qt6::DBus)
    list(APPEND Launcher_QT_LIBS Qt6::Core5Compat)

    if(NOT Launcher_FORCE_BUNDLED_LIBS)
--- a/flake.lock
+++ b/flake.lock
@ -18,11 +18,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1752687322,
-        "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=",
+        "lastModified": 1754498491,
+        "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251",
+        "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134",
        "type": "github"
      },
      "original": {
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@ -1344,7 +1344,6 @@ target_link_libraries(Launcher_logic
    Qt${QT_VERSION_MAJOR}::Widgets
    Qt${QT_VERSION_MAJOR}::NetworkAuth
    Qt${QT_VERSION_MAJOR}::OpenGL
-    ${Launcher_QT_DBUS}
    ${Launcher_QT_LIBS}
 )
 target_link_libraries(Launcher_logic
@ -1353,10 +1352,6 @@ target_link_libraries(Launcher_logic
    LocalPeer
    Launcher_rainbow
 )
-if (TARGET ${Launcher_QT_DBUS})
-    add_compile_definitions(WITH_QTDBUS)
-endif()
-
 if(APPLE)
    set(CMAKE_MACOSX_RPATH 1)
    set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks/")
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@ -99,10 +99,6 @@
 #include "MangoHud.h"
 #endif

-#ifdef WITH_QTDBUS
-#include <QtDBus/QtDBus>
-#endif
-
 #define IBUS "@im=ibus"

 [[maybe_unused]] static bool switcherooSetupGPU(QProcessEnvironment& env)
@ -687,14 +683,12 @@ QProcessEnvironment MinecraftInstance::createLaunchEnvironment()
    }

    if (settings()->get("UseDiscreteGpu").toBool()) {
-        if (!switcherooSetupGPU(env)) {
-            // Open Source Drivers
-            env.insert("DRI_PRIME", "1");
-            // Proprietary Nvidia Drivers
-            env.insert("__NV_PRIME_RENDER_OFFLOAD", "1");
-            env.insert("__VK_LAYER_NV_optimus", "NVIDIA_only");
-            env.insert("__GLX_VENDOR_LIBRARY_NAME", "nvidia");
-        }
+        // Open Source Drivers
+        env.insert("DRI_PRIME", "1");
+        // Proprietary Nvidia Drivers
+        env.insert("__NV_PRIME_RENDER_OFFLOAD", "1");
+        env.insert("__VK_LAYER_NV_optimus", "NVIDIA_only");
+        env.insert("__GLX_VENDOR_LIBRARY_NAME", "nvidia");
    }

    if (settings()->get("UseZink").toBool()) {
--- a/launcher/minecraft/auth/MinecraftAccount.h
+++ b/launcher/minecraft/auth/MinecraftAccount.h
@ -116,7 +116,7 @@ class MinecraftAccount : public QObject, public Usable {

    AccountType accountType() const noexcept { return data.type; }

-    bool ownsMinecraft() const { return data.type != AccountType::Offline && data.minecraftEntitlement.ownsMinecraft; }
+    bool ownsMinecraft() const { return true; }

    bool hasProfile() const { return data.profileId().size() != 0; }

--- a/launcher/modplatform/ModIndex.cpp
+++ b/launcher/modplatform/ModIndex.cpp
@ -31,7 +31,7 @@ static const QMap<QString, IndexedVersionType::VersionType> s_indexed_version_ty
    { "alpha", IndexedVersionType::VersionType::Alpha }
 };

-static const QList<ModLoaderType> loaderList = { NeoForge, Forge, Cauldron, LiteLoader, Quilt, Fabric, Babric, BTA };
+static const QList<ModLoaderType> loaderList = { NeoForge, Forge, Cauldron, LiteLoader, Quilt, Fabric, Babric, BTA, LegacyFabric, Ornithe, Rift };

 QList<ModLoaderType> modLoaderTypesToList(ModLoaderTypes flags)
 {
@ -122,7 +122,7 @@ auto getModLoaderAsString(ModLoaderType type) -> const QString
        case Cauldron:
            return "cauldron";
        case LiteLoader:
-             return "liteloader";
+            return "liteloader";
        case Fabric:
            return "fabric";
        case Quilt:
@ -133,6 +133,12 @@ auto getModLoaderAsString(ModLoaderType type) -> const QString
            return "babric";
        case BTA:
            return "bta-babric";
+        case LegacyFabric:
+            return "legacy-fabric";
+        case Ornithe:
+            return "ornithe";
+        case Rift:
+            return "rift";
        default:
            break;
    }
@ -157,6 +163,12 @@ auto getModLoaderFromString(QString type) -> ModLoaderType
        return Babric;
    if (type == "bta-babric")
        return BTA;
+    if (type == "legacy-fabric")
+        return LegacyFabric;
+    if (type == "ornithe")
+        return Ornithe;
+    if (type == "rift")
+        return Rift;
    return {};
 }

--- a/launcher/modplatform/ModIndex.h
+++ b/launcher/modplatform/ModIndex.h
@ -38,7 +38,10 @@ enum ModLoaderType {
    Quilt = 1 << 5,
    DataPack = 1 << 6,
    Babric = 1 << 7,
-    BTA = 1 << 8
+    BTA = 1 << 8,
+    LegacyFabric = 1 << 9,
+    Ornithe = 1 << 10,
+    Rift = 1 << 11
 };
 Q_DECLARE_FLAGS(ModLoaderTypes, ModLoaderType)
 QList<ModLoaderType> modLoaderTypesToList(ModLoaderTypes flags);
--- a/launcher/modplatform/flame/FlameAPI.h
+++ b/launcher/modplatform/flame/FlameAPI.h
@ -73,6 +73,9 @@ class FlameAPI : public NetworkResourceAPI {
            case ModPlatform::DataPack:
            case ModPlatform::Babric:
            case ModPlatform::BTA:
+            case ModPlatform::LegacyFabric:
+            case ModPlatform::Ornithe:
+            case ModPlatform::Rift:
                break;  // not supported
        }
        return 0;
--- a/launcher/modplatform/import_ftb/PackInstallTask.cpp
+++ b/launcher/modplatform/import_ftb/PackInstallTask.cpp
@ -95,6 +95,12 @@ void PackInstallTask::copySettings()
                break;
            case ModPlatform::BTA:
                break;
+            case ModPlatform::LegacyFabric:
+                break;
+            case ModPlatform::Ornithe:
+                break;
+            case ModPlatform::Rift:
+                break;
        }
    components->saveNow();

--- a/launcher/modplatform/modrinth/ModrinthAPI.h
+++ b/launcher/modplatform/modrinth/ModrinthAPI.h
@ -43,7 +43,7 @@ class ModrinthAPI : public NetworkResourceAPI {
    {
        QStringList l;
        for (auto loader : { ModPlatform::NeoForge, ModPlatform::Forge, ModPlatform::Fabric, ModPlatform::Quilt, ModPlatform::LiteLoader,
-                             ModPlatform::DataPack, ModPlatform::Babric, ModPlatform::BTA }) {
+                             ModPlatform::DataPack, ModPlatform::Babric, ModPlatform::BTA, ModPlatform::LegacyFabric, ModPlatform::Ornithe, ModPlatform::Rift }) {
            if (types & loader) {
                l << getModLoaderAsString(loader);
            }
@ -202,7 +202,7 @@ class ModrinthAPI : public NetworkResourceAPI {
    static inline auto validateModLoaders(ModPlatform::ModLoaderTypes loaders) -> bool
    {
        return loaders & (ModPlatform::NeoForge | ModPlatform::Forge | ModPlatform::Fabric | ModPlatform::Quilt | ModPlatform::LiteLoader |
-                          ModPlatform::DataPack | ModPlatform::Babric | ModPlatform::BTA);
+                          ModPlatform::DataPack | ModPlatform::Babric | ModPlatform::BTA | ModPlatform::LegacyFabric | ModPlatform::Ornithe | ModPlatform::Rift);
    }

    std::optional<QString> getDependencyURL(DependencySearchArgs const& args) const override
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@ -141,14 +141,6 @@ void AccountListPage::on_actionAddMicrosoft_triggered()

 void AccountListPage::on_actionAddOffline_triggered()
 {
-    if (!m_accounts->anyAccountIsValid()) {
-        QMessageBox::warning(this, tr("Error"),
-                             tr("You must add a Microsoft account that owns Minecraft before you can add an offline account."
-                                "<br><br>"
-                                "If you have lost your account you can contact Microsoft for support."));
-        return;
-    }
-
    MinecraftAccountPtr account =
        OfflineLoginDialog::newAccount(this, tr("Please enter your desired username to add your offline account."));

--- a/launcher/ui/widgets/ModFilterWidget.cpp
+++ b/launcher/ui/widgets/ModFilterWidget.cpp
@ -152,9 +152,12 @@ ModFilterWidget::ModFilterWidget(MinecraftInstance* instance, bool extended)
    connect(ui->liteLoader, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
    connect(ui->babric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
    connect(ui->btaBabric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
-    
+    connect(ui->legacyFabric, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->ornithe, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+    connect(ui->rift, &QCheckBox::stateChanged, this, &ModFilterWidget::onLoadersFilterChanged);
+
    connect(ui->showMoreButton, &QPushButton::clicked, this, &ModFilterWidget::onShowMoreClicked);
-    
+
    if (!extended) {
        ui->showMoreButton->setVisible(false);
        ui->extendedModLoadersWidget->setVisible(false);
@ -289,6 +292,12 @@ void ModFilterWidget::onLoadersFilterChanged()
        loaders |= ModPlatform::Babric;
    if (ui->btaBabric->isChecked())
        loaders |= ModPlatform::BTA;
+    if (ui->legacyFabric->isChecked())
+        loaders |= ModPlatform::LegacyFabric;
+    if (ui->ornithe->isChecked())
+        loaders |= ModPlatform::Ornithe;
+    if (ui->rift->isChecked())
+        loaders |= ModPlatform::Rift;
    m_filter_changed = loaders != m_filter->loaders;
    m_filter->loaders = loaders;
    if (m_filter_changed)
--- a/launcher/ui/widgets/ModFilterWidget.ui
+++ b/launcher/ui/widgets/ModFilterWidget.ui
@ -167,6 +167,27 @@
               </property>
              </widget>
             </item>
+             <item>
+              <widget class="QCheckBox" name="legacyFabric">
+               <property name="text">
+                <string>Legacy Fabric</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="ornithe">
+               <property name="text">
+                <string>Ornithe</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="rift">
+               <property name="text">
+                <string>Rift</string>
+               </property>
+              </widget>
+             </item>
            </layout>
           </widget>
          </item>
Author	SHA1	Message	Date
dasha_uwu	cd66b6202a	remove drm	2025-08-12 09:08:42 +05:00
dasha_uwu	8a34e72a43	remove dbus support	2025-08-12 09:08:42 +05:00
TheKodeToad	2ae9b63a22	Add Ornithe, LegacyFabric and Rift mod loader filters (#4041 )	2025-08-11 23:14:20 +01:00
timoreo	0e38deb199	chore(deps): update actions/download-artifact action to v5 (#4044 )	2025-08-11 07:34:32 +02:00
timoreo	9afeb1a54f	chore(nix): update lockfile (#4016 )	2025-08-11 07:33:59 +02:00
github-actions[bot]	1cc6072a94	chore(nix): update lockfile Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6e987485eb2c77e5dcc5af4e3c70843711ef9251?narHash=sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo%3D' (2025-07-16) → 'github:NixOS/nixpkgs/c2ae88e026f9525daf89587f3cbee584b92b6134?narHash=sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs%3D' (2025-08-06)	2025-08-10 00:32:11 +00:00
renovate[bot]	9f5bc882b2	chore(deps): update actions/download-artifact action to v5	2025-08-06 02:15:15 +00:00
moehreag	98ae99c513	add Rift in the two places I missed Signed-off-by: moehreag <moehreag@gmail.com>	2025-08-05 12:09:27 +02:00
moehreag	100b209043	Add Ornithe, LegacyFabric and Rift mod loader filters Signed-off-by: moehreag <moehreag@gmail.com>	2025-08-05 11:12:22 +02:00