From 7baac92f56e7ce5e7e8d755f5e98ffde81de5991 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Fri, 12 Dec 2025 12:07:19 +0000
Subject: [PATCH 1/2] Fix server columns being totally invisible

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/ui/pages/instance/ServersPage.cpp | 40 ++++++++++------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index f616a5b22..1948b6dcb 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -312,37 +312,33 @@ class ServersModel : public QAbstractListModel {
 
         switch (role) {
             case Qt::DecorationRole: {
-                switch (column) {
-                    case 0: {
-                        auto& bytes = m_servers[row].m_icon;
-                        if (bytes.size()) {
-                            QPixmap px;
-                            if (px.loadFromData(bytes))
-                                return QIcon(px);
-                        }
-                        return QIcon::fromTheme("unknown_server");
+                if (column == 0) {
+                    auto& bytes = m_servers[row].m_icon;
+                    if (bytes.size()) {
+                        QPixmap px;
+                        if (px.loadFromData(bytes))
+                            return QIcon(px);
                     }
+                    return QIcon::fromTheme("unknown_server");
+                } else {
+                    return QVariant();
+                }
+            }
+            case Qt::DisplayRole:
+                switch (column) {
+                    case 0:
+                        return m_servers[row].m_name;
                     case 1:
                         return m_servers[row].m_address;
-                    default:
-                        return QVariant();
-                }
-                case 2:
-                    if (role == Qt::DisplayRole) {
+                    case 2:
                         if (m_servers[row].m_currentPlayers) {
                             return *m_servers[row].m_currentPlayers;
                         } else {
                             return "...";
                         }
-                    } else {
+                    default:
                         return QVariant();
-                    }
-            }
-            case Qt::DisplayRole:
-                if (column == 0)
-                    return m_servers[row].m_name;
-                else
-                    return QVariant();
+                }
             case ServerPtrRole:
                 if (column == 0)
                     return QVariant::fromValue<void*>((void*)&m_servers[row]);

From 0d7244d56f4013edbe84cdbb0ff19eb92e6fa5d9 Mon Sep 17 00:00:00 2001
From: TheKodeToad <TheKodeToad@proton.me>
Date: Fri, 12 Dec 2025 12:14:51 +0000
Subject: [PATCH 2/2] Remove unused code

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
---
 launcher/ui/pages/instance/ServersPage.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index 1948b6dcb..59ae6e43f 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -112,11 +112,7 @@ struct Server {
     QByteArray m_icon;
 
     // Data - temporary
-    bool m_checked = false;
-    bool m_up = false;
-    QString m_motd;                       // https://mctools.org/motd-creator
     std::optional<int> m_currentPlayers;  // nullopt if not calculated/calculating
-    int m_maxPlayers = 0;
 };
 
 static std::unique_ptr<nbt::tag_compound> parseServersDat(const QString& filename)