Turn Card, Deck_List, Protocol, RNG, Network (Client, Server), Settings and Utility into libraries and remove cockatrice_common. (#6212)

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
Co-authored-by: ebbit1q <ebbit1q@gmail.com>

.github/workflows/translations-push.yml

@@ -31,10 +31,10 @@ jobs:
       - name: Update Cockatrice translation source
         id: cockatrice
         shell: bash
-        env:
+        run: |
-          FILE: 'cockatrice/cockatrice_en@source.ts'
+          FILE="cockatrice/cockatrice_en@source.ts"
-          DIRS: 'cockatrice/src common'
+          export DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')"
-        run: .ci/update_translation_source_strings.sh
+          FILE="$FILE" DIRS="$DIRS" .ci/update_translation_source_strings.sh
 
       - name: Update Oracle translation source
         id: oracle

CMakeLists.txt

@@ -328,7 +328,13 @@ endif()
 
 include(CPack)
 
-add_subdirectory(common)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_protocol ${CMAKE_BINARY_DIR}/libcockatrice_protocol)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_network ${CMAKE_BINARY_DIR}/libcockatrice_network)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_deck_list ${CMAKE_BINARY_DIR}/libcockatrice_deck_list)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libcockatrice_rng)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_settings ${CMAKE_BINARY_DIR}/libcockatrice_settings)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_card ${CMAKE_BINARY_DIR}/libcockatrice_card)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_utility ${CMAKE_BINARY_DIR}/libcockatrice_utility)
 if(WITH_SERVER)
   add_subdirectory(servatrice)
   set(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})

cockatrice/CMakeLists.txt

@@ -7,12 +7,6 @@ project(Cockatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${
 set(cockatrice_SOURCES
     ${VERSION_STRING_CPP}
     # sort by alphabetical order, so that there is no debate about where to add new sources to the list
-    src/card/card_info.cpp
-    src/card/card_relation.cpp
-    src/card/card_set.cpp
-    src/card/card_set_list.cpp
-    src/card/exact_card.cpp
-    src/card/printing_info.cpp
     src/client/deck_editor_menu.cpp
     src/client/get_text_with_max.cpp
     src/client/network/client_update_checker.cpp
@@ -25,19 +19,6 @@ set(cockatrice_SOURCES
     src/client/sound_engine.cpp
     src/client/tapped_out_interface.cpp
     src/client/update_downloader.cpp
-    src/database/card_database.cpp
-    src/database/card_database_loader.cpp
-    src/database/card_database_manager.cpp
-    src/database/card_database_querier.cpp
-    src/database/model/card_database_model.cpp
-    src/database/model/card_database_display_model.cpp
-    src/database/model/card/card_completer_proxy_model.cpp
-    src/database/model/card/card_search_model.cpp
-    src/database/model/token/token_display_model.cpp
-    src/database/model/token/token_edit_model.cpp
-    src/database/parser/card_database_parser.cpp
-    src/database/parser/cockatrice_xml_3.cpp
-    src/database/parser/cockatrice_xml_4.cpp
     src/deck/custom_line_edit.cpp
     src/deck/deck_list_model.cpp
     src/deck/deck_loader.cpp
@@ -138,6 +119,13 @@ set(cockatrice_SOURCES
     src/game/zones/table_zone.cpp
     src/game/zones/view_zone.cpp
     src/game/zones/view_zone_widget.cpp
+    src/interface/card_picture_loader/card_picture_loader.cpp
+    src/interface/card_picture_loader/card_picture_loader_local.cpp
+    src/interface/card_picture_loader/card_picture_loader_request_status_display_widget.cpp
+    src/interface/card_picture_loader/card_picture_loader_status_bar.cpp
+    src/interface/card_picture_loader/card_picture_loader_worker.cpp
+    src/interface/card_picture_loader/card_picture_loader_worker_work.cpp
+    src/interface/card_picture_loader/card_picture_to_load.cpp
     src/interface/layouts/flow_layout.cpp
     src/interface/layouts/overlap_layout.cpp
     src/interface/line_edit_completer.cpp
@@ -217,23 +205,10 @@ set(cockatrice_SOURCES
     src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp
     src/interface/window_main.cpp
     src/main.cpp
-    src/picture_loader/picture_loader.cpp
-    src/picture_loader/picture_loader_local.cpp
-    src/picture_loader/picture_loader_request_status_display_widget.cpp
-    src/picture_loader/picture_loader_status_bar.cpp
-    src/picture_loader/picture_loader_worker.cpp
-    src/picture_loader/picture_loader_worker_work.cpp
-    src/picture_loader/picture_to_load.cpp
-    src/server/abstract_client.cpp
     src/server/chat_view/chat_view.cpp
     src/server/game_selector.cpp
     src/server/games_model.cpp
     src/server/handle_public_servers.cpp
-    src/server/local_client.cpp
-    src/server/local_server.cpp
-    src/server/local_server_interface.cpp
-    src/server/pending_command.cpp
-    src/server/remote/remote_client.cpp
     src/server/remote/remote_decklist_tree_widget.cpp
     src/server/remote/remote_replay_list_tree_widget.cpp
     src/server/user/user_context_menu.cpp
@@ -241,20 +216,6 @@ set(cockatrice_SOURCES
     src/server/user/user_info_connection.cpp
     src/server/user/user_list_manager.cpp
     src/server/user/user_list_widget.cpp
-    src/settings/cache_settings.cpp
-    src/settings/card_counter_settings.cpp
-    src/settings/card_database_settings.cpp
-    src/settings/card_override_settings.cpp
-    src/settings/debug_settings.cpp
-    src/settings/download_settings.cpp
-    src/settings/game_filters_settings.cpp
-    src/settings/layouts_settings.cpp
-    src/settings/message_settings.cpp
-    src/settings/recents_settings.cpp
-    src/settings/servers_settings.cpp
-    src/settings/settings_manager.cpp
-    src/settings/shortcut_treeview.cpp
-    src/settings/shortcuts_settings.cpp
     src/tabs/abstract_tab_deck_editor.cpp
     src/tabs/api/edhrec/api_response/archidekt_links/edhrec_api_response_archidekt_links.cpp
     src/tabs/api/edhrec/api_response/average_deck/edhrec_average_deck_api_response.cpp
@@ -299,12 +260,8 @@ set(cockatrice_SOURCES
     src/tabs/visual_deck_editor/tab_deck_editor_visual.cpp
     src/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp
     src/tabs/visual_deck_storage/tab_deck_storage_visual.cpp
-    src/utility/card_info_comparator.cpp
+    src/interface/utility/deck_list_sort_filter_proxy_model.cpp
-    src/utility/deck_list_sort_filter_proxy_model.cpp
+    src/interface/utility/sequence_edit.cpp
-    src/utility/key_signals.cpp
-    src/utility/levenshtein.cpp
-    src/utility/logger.cpp
-    src/utility/sequence_edit.cpp
 )
 
 add_subdirectory(sounds)
@@ -316,15 +273,23 @@ configure_file(
 set(cockatrice_RESOURCES cockatrice.qrc)
 
 if(UPDATE_TRANSLATIONS)
+  # Cockatrice main sources
   file(GLOB_RECURSE translate_cockatrice_SRCS ${CMAKE_SOURCE_DIR}/cockatrice/src/*.cpp
        ${CMAKE_SOURCE_DIR}/cockatrice/src/*.h
   )
-  file(GLOB_RECURSE translate_common_SRCS ${CMAKE_SOURCE_DIR}/common/*.cpp ${CMAKE_SOURCE_DIR}/common/*.h)
+
-  set(translate_SRCS ${translate_cockatrice_SRCS} ${translate_common_SRCS})
+  # All libcockatrice_* libraries (recursively)
+  file(GLOB_RECURSE translate_lib_SRCS ${CMAKE_SOURCE_DIR}/libcockatrice_*/**/*.cpp
+       ${CMAKE_SOURCE_DIR}/libcockatrice_*/**/*.h
+  )
+
+  # Combine all sources for translation
+  set(translate_SRCS ${translate_cockatrice_SRCS} ${translate_lib_SRCS})
+
   set(cockatrice_TS "${CMAKE_CURRENT_SOURCE_DIR}/cockatrice_en@source.ts")
 else()
   file(GLOB cockatrice_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts")
-endif(UPDATE_TRANSLATIONS)
+endif()
 
 if(WIN32)
   set(cockatrice_SOURCES ${cockatrice_SOURCES} cockatrice.rc)
@@ -354,12 +319,6 @@ set(DESKTOPDIR
     CACHE STRING "desktop file destination"
 )
 
-# Include directories
-include_directories(../common)
-include_directories(${PROTOBUF_INCLUDE_DIR})
-include_directories(${CMAKE_BINARY_DIR}/common)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 set(COCKATRICE_MAC_QM_INSTALL_DIR "cockatrice.app/Contents/Resources/translations")
 set(COCKATRICE_UNIX_QM_INSTALL_DIR "share/cockatrice/translations")
 set(COCKATRICE_WIN32_QM_INSTALL_DIR "translations")
@@ -399,9 +358,20 @@ elseif(Qt5_FOUND)
 endif()
 
 if(Qt5_FOUND)
-  target_link_libraries(cockatrice cockatrice_common ${COCKATRICE_QT_MODULES})
+  target_link_libraries(
+    cockatrice
+    libcockatrice_card
+    libcockatrice_deck_list
+    libcockatrice_utility
+    libcockatrice_network
+    libcockatrice_rng
+    ${COCKATRICE_QT_MODULES}
+  )
 else()
-  target_link_libraries(cockatrice PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES})
+  target_link_libraries(
+    cockatrice PUBLIC libcockatrice_card libcockatrice_deck_list libcockatrice_utility libcockatrice_network
+                      libcockatrice_rng ${COCKATRICE_QT_MODULES}
+  )
 endif()
 
 if(UNIX)

cockatrice/src/client/deck_editor_menu.cpp

@@ -1,7 +1,7 @@
 #include "deck_editor_menu.h"
 
-#include "../settings/cache_settings.h"
+#include <libcockatrice/settings/cache_settings.h>
-#include "../settings/shortcuts_settings.h"
+#include <libcockatrice/settings/shortcuts_settings.h>
 
 DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent)
 {

cockatrice/src/client/get_text_with_max.h

@@ -7,9 +7,8 @@
 #ifndef GETTEXTWITHMAX_H
 #define GETTEXTWITHMAX_H
 
-#include "trice_limits.h"
-
 #include <QInputDialog>
+#include <libcockatrice/utility/trice_limits.h>
 
 QString getTextWithMax(QWidget *parent,
                        const QString &title,

cockatrice/src/client/network/client_update_checker.cpp

@@ -1,8 +1,9 @@
 #include "client_update_checker.h"
 
-#include "../../settings/cache_settings.h"
 #include "release_channel.h"
 
+#include <libcockatrice/settings/cache_settings.h>
+
 ClientUpdateChecker::ClientUpdateChecker(QObject *parent) : QObject(parent)
 {
 }

cockatrice/src/client/network/replay_timeline_widget.cpp

@@ -1,11 +1,10 @@
 #include "replay_timeline_widget.h"
 
-#include "../../settings/cache_settings.h"
-
 #include <QPainter>
 #include <QPainterPath>
 #include <QPalette>
 #include <QTimer>
+#include <libcockatrice/settings/cache_settings.h>
 
 ReplayTimelineWidget::ReplayTimelineWidget(QWidget *parent)
     : QWidget(parent), maxBinValue(1), maxTime(1), timeScaleFactor(1.0), currentVisualTime(0), currentProcessedTime(0),

cockatrice/src/client/network/sets_model.h

@@ -7,12 +7,11 @@
 #ifndef SETSMODEL_H
 #define SETSMODEL_H
 
-#include "../../database/card_database.h"
-
 #include <QAbstractTableModel>
 #include <QMimeData>
 #include <QSet>
 #include <QSortFilterProxyModel>
+#include <libcockatrice/card/card_database/card_database.h>
 
 class SetsProxyModel;
 

cockatrice/src/client/network/spoiler_background_updater.cpp

@@ -1,10 +1,7 @@
 #include "spoiler_background_updater.h"
 
-#include "../../database/card_database.h"
-#include "../../database/card_database_manager.h"
 #include "../../interface/window_main.h"
 #include "../../main.h"
-#include "../../settings/cache_settings.h"
 
 #include <QApplication>
 #include <QCryptographicHash>
@@ -16,6 +13,9 @@
 #include <QNetworkReply>
 #include <QUrl>
 #include <QtConcurrent>
+#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/settings/cache_settings.h>
 
 #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled"
 #define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml"

cockatrice/src/client/replay_manager.h

@@ -9,10 +9,10 @@
 #define REPLAY_MANAGER_H
 
 #include "network/replay_timeline_widget.h"
-#include "pb/game_replay.pb.h"
 
 #include <QToolButton>
 #include <QWidget>
+#include <libcockatrice/protocol/pb/game_replay.pb.h>
 
 class TabGame;
 

cockatrice/src/client/sound_engine.cpp

@@ -1,9 +1,8 @@
 #include "sound_engine.h"
 
-#include "../settings/cache_settings.h"
-
 #include <QDir>
 #include <QMediaPlayer>
+#include <libcockatrice/settings/cache_settings.h>
 
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
 #include <QAudioOutput>

cockatrice/src/client/tapped_out_interface.cpp

@@ -1,8 +1,5 @@
 #include "tapped_out_interface.h"
 
-#include "deck_list.h"
-#include "deck_list_card_node.h"
-
 #include <QDesktopServices>
 #include <QMessageBox>
 #include <QNetworkAccessManager>
@@ -10,6 +7,8 @@
 #include <QNetworkRequest>
 #include <QRegularExpression>
 #include <QUrlQuery>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/deck_list_card_node.h>
 
 TappedOutInterface::TappedOutInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)

cockatrice/src/client/tapped_out_interface.h

@@ -7,11 +7,10 @@
 #ifndef TAPPEDOUT_INTERFACE_H
 #define TAPPEDOUT_INTERFACE_H
 
-#include "../database/card_database.h"
-#include "deck_list.h"
-
 #include <QLoggingCategory>
 #include <QObject>
+#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 inline Q_LOGGING_CATEGORY(TappedOutInterfaceLog, "tapped_out_interface");
 

cockatrice/src/deck/custom_line_edit.cpp

@@ -1,13 +1,12 @@
 #include "custom_line_edit.h"
 
-#include "../settings/cache_settings.h"
-#include "../settings/shortcuts_settings.h"
-
 #include <QKeyEvent>
 #include <QLineEdit>
 #include <QObject>
 #include <QTreeView>
 #include <QWidget>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/settings/shortcuts_settings.h>
 
 LineEditUnfocusable::LineEditUnfocusable(QWidget *parent) : QLineEdit(parent)
 {

cockatrice/src/deck/deck_list_model.cpp

@@ -1,8 +1,6 @@
 #include "deck_list_model.h"
 
-#include "../database/card_database_manager.h"
 #include "../main.h"
-#include "../settings/cache_settings.h"
 #include "deck_loader.h"
 
 #include <QBrush>
@@ -13,6 +11,8 @@
 #include <QTextDocument>
 #include <QTextStream>
 #include <QTextTable>
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/settings/cache_settings.h>
 
 DeckListModel::DeckListModel(QObject *parent)
     : QAbstractItemModel(parent), lastKnownColumn(1), lastKnownOrder(Qt::AscendingOrder)

cockatrice/src/deck/deck_list_model.h

@@ -1,13 +1,12 @@
 #ifndef DECKLISTMODEL_H
 #define DECKLISTMODEL_H
 
-#include "../card/exact_card.h"
-#include "abstract_deck_list_card_node.h"
-#include "deck_list.h"
-#include "deck_list_card_node.h"
-
 #include <QAbstractItemModel>
 #include <QList>
+#include <libcockatrice/card/card_printing/exact_card.h>
+#include <libcockatrice/deck_list/abstract_deck_list_card_node.h>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/deck_list_card_node.h>
 
 class DeckLoader;
 class CardDatabase;

cockatrice/src/deck/deck_loader.cpp

@@ -1,10 +1,6 @@
 #include "deck_loader.h"
 
-#include "../database/card_database.h"
-#include "../database/card_database_manager.h"
 #include "../main.h"
-#include "deck_list.h"
-#include "deck_list_card_node.h"
 
 #include <QApplication>
 #include <QClipboard>
@@ -16,6 +12,10 @@
 #include <QRegularExpression>
 #include <QStringList>
 #include <QtConcurrentRun>
+#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/deck_list_card_node.h>
 
 const QStringList DeckLoader::ACCEPTED_FILE_EXTENSIONS = {"*.cod", "*.dec", "*.dek", "*.txt", "*.mwDeck"};
 

cockatrice/src/deck/deck_loader.h

@@ -7,9 +7,8 @@
 #ifndef DECK_LOADER_H
 #define DECK_LOADER_H
 
-#include "deck_list.h"
-
 #include <QLoggingCategory>
+#include <libcockatrice/deck_list/deck_list.h>
 
 inline Q_LOGGING_CATEGORY(DeckLoaderLog, "deck_loader")
 

cockatrice/src/deck/deck_stats_interface.cpp

@@ -1,8 +1,5 @@
 #include "deck_stats_interface.h"
 
-#include "deck_list.h"
-#include "deck_list_card_node.h"
-
 #include <QDesktopServices>
 #include <QMessageBox>
 #include <QNetworkAccessManager>
@@ -10,6 +7,8 @@
 #include <QNetworkRequest>
 #include <QRegularExpression>
 #include <QUrlQuery>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/deck_list_card_node.h>
 
 DeckStatsInterface::DeckStatsInterface(CardDatabase &_cardDatabase, QObject *parent)
     : QObject(parent), cardDatabase(_cardDatabase)

cockatrice/src/deck/deck_stats_interface.h

@@ -7,10 +7,9 @@
 #ifndef DECKSTATS_INTERFACE_H
 #define DECKSTATS_INTERFACE_H
 
-#include "../database/card_database.h"
-#include "deck_list.h"
-
 #include <QObject>
+#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/deck_list/deck_list.h>
 
 class QByteArray;
 class QNetworkAccessManager;

cockatrice/src/dialogs/dlg_connect.cpp

@@ -1,8 +1,5 @@
 #include "dlg_connect.h"
 
-#include "../settings/cache_settings.h"
-#include "trice_limits.h"
-
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDebug>
@@ -15,6 +12,8 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QRadioButton>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
 {

cockatrice/src/dialogs/dlg_connect.h

@@ -9,10 +9,10 @@
 
 #include "../server/handle_public_servers.h"
 #include "../server/user/user_info_connection.h"
-#include "../utility/macros.h"
 
 #include <QDialog>
 #include <QLineEdit>
+#include <libcockatrice/utility/macros.h>
 
 class QCheckBox;
 class QComboBox;

cockatrice/src/dialogs/dlg_create_game.cpp

@@ -1,10 +1,6 @@
 #include "dlg_create_game.h"
 
-#include "../server/pending_command.h"
-#include "../settings/cache_settings.h"
 #include "../tabs/tab_room.h"
-#include "pb/serverinfo_game.pb.h"
-#include "trice_limits.h"
 
 #include <QApplication>
 #include <QCheckBox>
@@ -19,6 +15,10 @@
 #include <QSet>
 #include <QSpinBox>
 #include <QWizard>
+#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 void DlgCreateGame::sharedCtor()
 {

cockatrice/src/dialogs/dlg_create_game.h

@@ -7,10 +7,9 @@
 #ifndef DLG_CREATEGAME_H
 #define DLG_CREATEGAME_H
 
-#include "../utility/macros.h"
-
 #include <QDialog>
 #include <QMap>
+#include <libcockatrice/utility/macros.h>
 
 class QCheckBox;
 class QDialogButtonBox;

cockatrice/src/dialogs/dlg_default_tags_editor.cpp

@@ -1,9 +1,8 @@
 #include "dlg_default_tags_editor.h"
 
-#include "../settings/cache_settings.h"
-
 #include <QMessageBox>
 #include <QVBoxLayout>
+#include <libcockatrice/settings/cache_settings.h>
 
 DlgDefaultTagsEditor::DlgDefaultTagsEditor(QWidget *parent) : QDialog(parent)
 {

cockatrice/src/dialogs/dlg_edit_avatar.cpp

@@ -1,7 +1,5 @@
 #include "dlg_edit_avatar.h"
 
-#include "trice_limits.h"
-
 #include <QBuffer>
 #include <QDebug>
 #include <QDialogButtonBox>
@@ -11,6 +9,7 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QVBoxLayout>
+#include <libcockatrice/utility/trice_limits.h>
 
 DlgEditAvatar::DlgEditAvatar(QWidget *parent) : QDialog(parent), image()
 {

cockatrice/src/dialogs/dlg_edit_password.cpp

@@ -1,13 +1,12 @@
 #include "dlg_edit_password.h"
 
-#include "../settings/cache_settings.h"
-#include "trice_limits.h"
-
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent)
 {

cockatrice/src/dialogs/dlg_edit_tokens.cpp

@@ -1,12 +1,7 @@
 #include "dlg_edit_tokens.h"
 
 #include "../client/get_text_with_max.h"
-#include "../database/card_database.h"
-#include "../database/card_database_manager.h"
-#include "../database/model/card_database_model.h"
-#include "../database/model/token/token_edit_model.h"
 #include "../main.h"
-#include "trice_limits.h"
 
 #include <QAction>
 #include <QComboBox>
@@ -22,6 +17,11 @@
 #include <QToolBar>
 #include <QTreeView>
 #include <QVBoxLayout>
+#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/card/card_database/model/token/token_edit_model.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr)
 {

cockatrice/src/dialogs/dlg_edit_tokens.h

@@ -7,9 +7,8 @@
 #ifndef DLG_EDIT_TOKENS_H
 #define DLG_EDIT_TOKENS_H
 
-#include "../card/card_info.h"
-
 #include <QDialog>
+#include <libcockatrice/card/card_info.h>
 
 class QModelIndex;
 class CardDatabaseModel;

cockatrice/src/dialogs/dlg_edit_user.cpp

@@ -1,13 +1,12 @@
 #include "dlg_edit_user.h"
 
-#include "../settings/cache_settings.h"
-#include "trice_limits.h"
-
 #include <QDebug>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QString realName) : QDialog(parent)
 {

cockatrice/src/dialogs/dlg_forgot_password_challenge.cpp

@@ -1,8 +1,5 @@
 #include "dlg_forgot_password_challenge.h"
 
-#include "../settings/cache_settings.h"
-#include "trice_limits.h"
-
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@@ -10,6 +7,8 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent)
 {

cockatrice/src/dialogs/dlg_forgot_password_request.cpp

@@ -1,8 +1,5 @@
 #include "dlg_forgot_password_request.h"
 
-#include "../settings/cache_settings.h"
-#include "trice_limits.h"
-
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@@ -10,6 +7,8 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent)
 {

cockatrice/src/dialogs/dlg_forgot_password_reset.cpp

@@ -1,8 +1,5 @@
 #include "dlg_forgot_password_reset.h"
 
-#include "../settings/cache_settings.h"
-#include "trice_limits.h"
-
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@@ -10,6 +7,8 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent)
 {

cockatrice/src/dialogs/dlg_load_deck.cpp

@@ -1,7 +1,8 @@
 #include "dlg_load_deck.h"
 
 #include "../deck/deck_loader.h"
-#include "../settings/cache_settings.h"
+
+#include <libcockatrice/settings/cache_settings.h>
 
 DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))
 {

cockatrice/src/dialogs/dlg_load_deck_from_clipboard.cpp

@@ -1,7 +1,6 @@
 #include "dlg_load_deck_from_clipboard.h"
 
 #include "../deck/deck_loader.h"
-#include "../settings/cache_settings.h"
 #include "dlg_settings.h"
 
 #include <QApplication>
@@ -13,6 +12,7 @@
 #include <QPushButton>
 #include <QTextStream>
 #include <QVBoxLayout>
+#include <libcockatrice/settings/cache_settings.h>
 
 /**
  * Creates the main layout and connects the signals that are common to all versions of this window

cockatrice/src/dialogs/dlg_manage_sets.cpp

@@ -1,11 +1,9 @@
 #include "dlg_manage_sets.h"
 
 #include "../client/network/sets_model.h"
-#include "../database/card_database_manager.h"
 #include "../deck/custom_line_edit.h"
+#include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../main.h"
-#include "../picture_loader/picture_loader.h"
-#include "../settings/cache_settings.h"
 
 #include <QAction>
 #include <QCheckBox>
@@ -22,6 +20,8 @@
 #include <QToolBar>
 #include <QTreeView>
 #include <algorithm>
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/settings/cache_settings.h>
 
 #define SORT_RESET -1
 
@@ -251,7 +251,7 @@ void WndSets::actSave()
 {
     model->save(CardDatabaseManager::getInstance());
     SettingsCache::instance().setIncludeRebalancedCards(includeRebalancedCards);
-    PictureLoader::clearPixmapCache();
+    CardPictureLoader::clearPixmapCache();
     close();
 }
 

cockatrice/src/dialogs/dlg_register.cpp

@@ -1,9 +1,5 @@
 #include "dlg_register.h"
 
-#include "../settings/cache_settings.h"
-#include "pb/serverinfo_user.pb.h"
-#include "trice_limits.h"
-
 #include <QCheckBox>
 #include <QDebug>
 #include <QDialogButtonBox>
@@ -11,6 +7,9 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QMessageBox>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent)
 {

cockatrice/src/dialogs/dlg_select_set_for_cards.cpp

@@ -1,6 +1,5 @@
 #include "dlg_select_set_for_cards.h"
 
-#include "../database/card_database_manager.h"
 #include "../deck/deck_loader.h"
 #include "../interface/widgets/cards/card_info_picture_widget.h"
 #include "../interface/widgets/general/layout_containers/flow_widget.h"
@@ -17,6 +16,7 @@
 #include <QSplitter>
 #include <QVBoxLayout>
 #include <algorithm>
+#include <libcockatrice/card/card_database/card_database_manager.h>
 #include <qdrag.h>
 #include <qevent.h>
 

cockatrice/src/dialogs/dlg_settings.cpp

@@ -4,18 +4,13 @@
 #include "../client/network/release_channel.h"
 #include "../client/network/spoiler_background_updater.h"
 #include "../client/sound_engine.h"
-#include "../database/card_database.h"
-#include "../database/card_database_manager.h"
 #include "../deck/custom_line_edit.h"
+#include "../interface/card_picture_loader/card_picture_loader.h"
 #include "../interface/theme_manager.h"
+#include "../interface/utility/sequence_edit.h"
 #include "../interface/widgets/general/background_sources.h"
 #include "../main.h"
-#include "../picture_loader/picture_loader.h"
-#include "../settings/cache_settings.h"
-#include "../settings/card_counter_settings.h"
-#include "../settings/shortcut_treeview.h"
 #include "../tabs/tab_supervisor.h"
-#include "../utility/sequence_edit.h"
 
 #include <QAbstractButton>
 #include <QAbstractListModel>
@@ -48,6 +43,11 @@
 #include <QToolBar>
 #include <QTranslator>
 #include <QVariant>
+#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/settings/card_counter_settings.h>
+#include <libcockatrice/settings/shortcut_treeview.h>
 
 #define WIKI_CUSTOM_PIC_URL "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Picture-Download-URLs"
 #define WIKI_CUSTOM_SHORTCUTS "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts"
@@ -679,8 +679,8 @@ void AppearanceSettingsPage::overrideAllCardArtWithPersonalPreferenceToggled(QT_
     if (result == QMessageBox::Yes) {
         SettingsCache::instance().setOverrideAllCardArtWithPersonalPreference(value);
         // Caches are now invalid.
-        PictureLoader::clearPixmapCache();
+        CardPictureLoader::clearPixmapCache();
-        PictureLoader::clearNetworkCache();
+        CardPictureLoader::clearNetworkCache();
     } else {
         // If user cancels, revert the checkbox/state back
         QTimer::singleShot(0, this, [this, enable]() {
@@ -1124,7 +1124,7 @@ void DeckEditorSettingsPage::resetDownloadedURLsButtonClicked()
 
 void DeckEditorSettingsPage::clearDownloadedPicsButtonClicked()
 {
-    PictureLoader::clearNetworkCache();
+    CardPictureLoader::clearNetworkCache();
 
     // These are not used anymore, but we don't delete them automatically, so
     // we should do it here lest we leave pictures hanging around on users'

cockatrice/src/dialogs/dlg_settings.h

@@ -7,8 +7,6 @@
 #ifndef DLG_SETTINGS_H
 #define DLG_SETTINGS_H
 
-#include "../utility/macros.h"
-
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDialog>
@@ -17,6 +15,7 @@
 #include <QLoggingCategory>
 #include <QPushButton>
 #include <QSpinBox>
+#include <libcockatrice/utility/macros.h>
 
 inline Q_LOGGING_CATEGORY(DlgSettingsLog, "dlg_settings");
 

cockatrice/src/dialogs/dlg_startup_card_check.cpp

@@ -1,8 +1,7 @@
 #include "dlg_startup_card_check.h"
 
-#include "../settings/cache_settings.h"
-
 #include <QDate>
+#include <libcockatrice/settings/cache_settings.h>
 
 DlgStartupCardCheck::DlgStartupCardCheck(QWidget *parent) : QDialog(parent)
 {

cockatrice/src/dialogs/dlg_tip_of_the_day.cpp

@@ -1,6 +1,5 @@
 #include "dlg_tip_of_the_day.h"
 
-#include "../settings/cache_settings.h"
 #include "tip_of_the_day.h"
 
 #include <QCheckBox>
@@ -10,6 +9,7 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QPushButton>
+#include <libcockatrice/settings/cache_settings.h>
 
 #define MIN_TIP_IMAGE_HEIGHT 200
 #define MIN_TIP_IMAGE_WIDTH 200

cockatrice/src/dialogs/dlg_update.cpp

@@ -3,7 +3,6 @@
 #include "../client/network/client_update_checker.h"
 #include "../client/network/release_channel.h"
 #include "../interface/window_main.h"
-#include "../settings/cache_settings.h"
 
 #include <QApplication>
 #include <QDesktopServices>
@@ -14,6 +13,7 @@
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QtNetwork>
+#include <libcockatrice/settings/cache_settings.h>
 #include <version_string.h>
 
 DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent)

cockatrice/src/dialogs/dlg_view_log.cpp

@@ -1,13 +1,12 @@
 #include "dlg_view_log.h"
 
-#include "../settings/cache_settings.h"
-#include "../utility/logger.h"
-
 #include <QClipboard>
 #include <QPlainTextEdit>
 #include <QPushButton>
 #include <QRegularExpression>
 #include <QVBoxLayout>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/logger.h>
 
 DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent)
 {

cockatrice/src/filters/deck_filter_string.cpp

@@ -1,8 +1,9 @@
 #include "deck_filter_string.h"
 
-#include "../database/card_database_manager.h"
 #include "filter_string.h"
-#include "lib/peglib.h"
+
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/utility/peglib.h>
 
 static peg::parser search(R"(
 Start <- QueryPartList

cockatrice/src/filters/filter_string.cpp

@@ -1,12 +1,11 @@
 #include "filter_string.h"
 
-#include "../../../common/lib/peglib.h"
-
 #include <QByteArray>
 #include <QDebug>
 #include <QRegularExpression>
 #include <QString>
 #include <functional>
+#include <libcockatrice/utility/peglib.h>
 
 static peg::parser search(R"(
 Start <- QueryPartList

cockatrice/src/filters/filter_string.h

@@ -7,13 +7,13 @@
 #ifndef FILTER_STRING_H
 #define FILTER_STRING_H
 
-#include "../card/card_info.h"
 #include "filter_tree.h"
 
 #include <QLoggingCategory>
 #include <QMap>
 #include <QString>
 #include <functional>
+#include <libcockatrice/card/card_info.h>
 #include <utility>
 
 inline Q_LOGGING_CATEGORY(FilterStringLog, "filter_string");

cockatrice/src/filters/filter_tree.h

@@ -7,12 +7,12 @@
 #ifndef FILTERTREE_H
 #define FILTERTREE_H
 
-#include "../database/card_database.h"
 #include "filter_card.h"
 
 #include <QList>
 #include <QMap>
 #include <QObject>
+#include <libcockatrice/card/card_database/card_database.h>
 #include <utility>
 
 class FilterTreeNode

cockatrice/src/game/abstract_game.h

@@ -7,13 +7,13 @@
 #ifndef COCKATRICE_ABSTRACT_GAME_H
 #define COCKATRICE_ABSTRACT_GAME_H
 
-#include "../../../common/pb/game_replay.pb.h"
 #include "game_event_handler.h"
 #include "game_meta_info.h"
 #include "game_state.h"
 #include "player/player_manager.h"
 
 #include <QObject>
+#include <libcockatrice/protocol/pb/game_replay.pb.h>
 
 class CardItem;
 class TabGame;

cockatrice/src/game/board/abstract_card_drag_item.cpp

@@ -1,11 +1,10 @@
 #include "abstract_card_drag_item.h"
 
-#include "../../settings/cache_settings.h"
-
 #include <QCursor>
 #include <QDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
+#include <libcockatrice/settings/cache_settings.h>
 
 static const float CARD_WIDTH_HALF = CARD_WIDTH / 2;
 static const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2;

cockatrice/src/game/board/abstract_card_item.cpp

@@ -1,9 +1,6 @@
 #include "abstract_card_item.h"
 
-#include "../../database/card_database.h"
+#include "../../interface/card_picture_loader/card_picture_loader.h"
-#include "../../database/card_database_manager.h"
-#include "../../picture_loader/picture_loader.h"
-#include "../../settings/cache_settings.h"
 #include "../game_scene.h"
 
 #include <QCursor>
@@ -11,6 +8,9 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <algorithm>
+#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/settings/cache_settings.h>
 
 AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, Player *_owner, int _id)
     : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0),
@@ -119,11 +119,11 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS
 
     if (facedown || cardRef.name.isEmpty()) {
         // never reveal card color, always paint the card back
-        PictureLoader::getCardBackPixmap(translatedPixmap, translatedSize.toSize());
+        CardPictureLoader::getCardBackPixmap(translatedPixmap, translatedSize.toSize());
     } else {
         // don't even spend time trying to load the picture if our size is too small
         if (translatedSize.width() > 10) {
-            PictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize());
+            CardPictureLoader::getPixmap(translatedPixmap, exactCard, translatedSize.toSize());
             if (translatedPixmap.isNull())
                 paintImage = false;
         } else {

cockatrice/src/game/board/abstract_card_item.h

@@ -7,11 +7,12 @@
 #ifndef ABSTRACTCARDITEM_H
 #define ABSTRACTCARDITEM_H
 
-#include "../../card/exact_card.h"
 #include "arrow_target.h"
-#include "card_ref.h"
 #include "graphics_item_type.h"
 
+#include <libcockatrice/card/card_printing/exact_card.h>
+#include <libcockatrice/utility/card_ref.h>
+
 class Player;
 
 const int CARD_WIDTH = 72;

cockatrice/src/game/board/abstract_counter.cpp

@@ -1,11 +1,7 @@
 #include "abstract_counter.h"
 
-#include "../../settings/cache_settings.h"
 #include "../../tabs/tab_game.h"
 #include "../player/player.h"
-#include "expression.h"
-#include "pb/command_inc_counter.pb.h"
-#include "pb/command_set_counter.pb.h"
 #include "translate_counter_name.h"
 
 #include <QAction>
@@ -16,6 +12,10 @@
 #include <QMenu>
 #include <QPainter>
 #include <QString>
+#include <libcockatrice/protocol/pb/command_inc_counter.pb.h>
+#include <libcockatrice/protocol/pb/command_set_counter.pb.h>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/expression.h>
 
 AbstractCounter::AbstractCounter(Player *_player,
                                  int _id,

cockatrice/src/game/board/arrow_item.cpp

@@ -1,22 +1,22 @@
 #define _USE_MATH_DEFINES
 #include "arrow_item.h"
 
-#include "../../card/card_info.h"
-#include "../../settings/cache_settings.h"
 #include "../player/player.h"
 #include "../player/player_target.h"
 #include "../zones/card_zone.h"
 #include "card_item.h"
-#include "color.h"
-#include "pb/command_attach_card.pb.h"
-#include "pb/command_create_arrow.pb.h"
-#include "pb/command_delete_arrow.pb.h"
 
 #include <QDebug>
 #include <QGraphicsScene>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
 #include <QtMath>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
+#include <libcockatrice/protocol/pb/command_create_arrow.pb.h>
+#include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/color.h>
 
 ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color)
     : QGraphicsItem(), player(_player), id(_id), startItem(_startItem), targetItem(_targetItem), targetLocked(false),

cockatrice/src/game/board/card_item.cpp

@@ -1,8 +1,5 @@
 #include "card_item.h"
 
-#include "../../card/card_info.h"
-#include "../../settings/cache_settings.h"
-#include "../../settings/card_counter_settings.h"
 #include "../../tabs/tab_game.h"
 #include "../game_scene.h"
 #include "../player/player.h"
@@ -12,12 +9,15 @@
 #include "../zones/view_zone.h"
 #include "arrow_item.h"
 #include "card_drag_item.h"
-#include "pb/serverinfo_card.pb.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QMenu>
 #include <QPainter>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/settings/card_counter_settings.h>
 
 CardItem::CardItem(Player *_owner, QGraphicsItem *parent, const CardRef &cardRef, int _cardid, CardZoneLogic *_zone)
     : AbstractCardItem(parent, cardRef, _owner, _cardid), zone(_zone), attacking(false), destroyOnZoneChange(false),

cockatrice/src/game/board/card_item.h

@@ -9,7 +9,8 @@
 
 #include "../zones/logic/card_zone_logic.h"
 #include "abstract_card_item.h"
-#include "server/game/server_card.h"
+
+#include <libcockatrice/network/server/remote/game/server_card.h>
 
 class CardDatabase;
 class CardDragItem;

cockatrice/src/game/board/card_list.cpp

@@ -1,10 +1,10 @@
 #include "card_list.h"
 
-#include "../../card/card_info.h"
 #include "card_item.h"
 
 #include <QDebug>
 #include <algorithm>
+#include <libcockatrice/card/card_info.h>
 
 CardList::CardList(bool _contentsKnown) : QList<CardItem *>(), contentsKnown(_contentsKnown)
 {

cockatrice/src/game/deckview/deck_view.cpp

@@ -1,16 +1,16 @@
 #include "deck_view.h"
 
-#include "../../card/card_info.h"
 #include "../../interface/theme_manager.h"
-#include "../../settings/cache_settings.h"
-#include "deck_list.h"
-#include "deck_list_card_node.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QMouseEvent>
 #include <QtMath>
 #include <algorithm>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/deck_list_card_node.h>
+#include <libcockatrice/settings/cache_settings.h>
 
 DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item,
                                            const QPointF &_hotSpot,

cockatrice/src/game/deckview/deck_view.h

@@ -8,13 +8,13 @@
 #define DECKVIEW_H
 
 #include "../board/abstract_card_drag_item.h"
-#include "pb/move_card_to_zone.pb.h"
 
 #include <QGraphicsScene>
 #include <QGraphicsView>
 #include <QMap>
 #include <QMultiMap>
 #include <QPixmap>
+#include <libcockatrice/protocol/pb/move_card_to_zone.pb.h>
 
 class DeckList;
 class InnerDecklistNode;

cockatrice/src/game/deckview/deck_view_container.cpp

@@ -1,29 +1,29 @@
 #include "deck_view_container.h"
 
-#include "../../database/card_database.h"
-#include "../../database/card_database_manager.h"
 #include "../../deck/deck_loader.h"
 #include "../../dialogs/dlg_load_deck.h"
 #include "../../dialogs/dlg_load_deck_from_clipboard.h"
 #include "../../dialogs/dlg_load_deck_from_website.h"
 #include "../../dialogs/dlg_load_remote_deck.h"
-#include "../../picture_loader/picture_loader.h"
+#include "../../interface/card_picture_loader/card_picture_loader.h"
-#include "../../server/pending_command.h"
-#include "../../settings/cache_settings.h"
 #include "../../tabs/tab_game.h"
 #include "../game_scene.h"
 #include "deck_view.h"
-#include "pb/command_deck_select.pb.h"
-#include "pb/command_ready_start.pb.h"
-#include "pb/command_set_sideboard_lock.pb.h"
-#include "pb/command_set_sideboard_plan.pb.h"
-#include "pb/response_deck_download.pb.h"
-#include "trice_limits.h"
 
 #include <QMessageBox>
 #include <QMouseEvent>
 #include <QToolButton>
 #include <google/protobuf/descriptor.h>
+#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/protocol/pb/command_deck_select.pb.h>
+#include <libcockatrice/protocol/pb/command_ready_start.pb.h>
+#include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>
+#include <libcockatrice/protocol/pb/command_set_sideboard_plan.pb.h>
+#include <libcockatrice/protocol/pb/response_deck_download.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 ToggleButton::ToggleButton(QWidget *parent) : QPushButton(parent), state(false)
 {
@@ -332,7 +332,7 @@ void DeckViewContainer::deckSelectFinished(const Response &r)
 {
     const Response_DeckDownload &resp = r.GetExtension(Response_DeckDownload::ext);
     DeckLoader newDeck(QString::fromStdString(resp.deck()));
-    PictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
+    CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(newDeck.getCardRefList()));
     setDeck(newDeck);
     switchToDeckLoadedView();
 }

cockatrice/src/game/dialogs/dlg_create_token.cpp

@@ -1,13 +1,7 @@
 #include "dlg_create_token.h"
 
-#include "../../database/card_database_manager.h"
-#include "../../database/model/card_database_model.h"
-#include "../../database/model/token/token_display_model.h"
 #include "../../interface/widgets/cards/card_info_picture_widget.h"
 #include "../../main.h"
-#include "../../settings/cache_settings.h"
-#include "deck_list.h"
-#include "trice_limits.h"
 
 #include <QCheckBox>
 #include <QCloseEvent>
@@ -22,6 +16,12 @@
 #include <QRadioButton>
 #include <QTreeView>
 #include <QVBoxLayout>
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/card_database/model/card_database_model.h>
+#include <libcockatrice/card/card_database/model/token/token_display_model.h>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent)
     : QDialog(parent), predefinedTokens(_predefinedTokens)

cockatrice/src/game/dialogs/dlg_move_top_cards_until.cpp

@@ -1,7 +1,5 @@
 #include "dlg_move_top_cards_until.h"
 
-#include "../../database/card_database.h"
-#include "../../database/card_database_manager.h"
 #include "../../filters/filter_string.h"
 
 #include <QDialogButtonBox>
@@ -12,6 +10,8 @@
 #include <QString>
 #include <QVBoxLayout>
 #include <QWidget>
+#include <libcockatrice/card/card_database/card_database.h>
+#include <libcockatrice/card/card_database/card_database_manager.h>
 
 DlgMoveTopCardsUntil::DlgMoveTopCardsUntil(QWidget *parent, QStringList exprs, uint _numberOfHits, bool autoPlay)
     : QDialog(parent)

cockatrice/src/game/dialogs/dlg_roll_dice.cpp

@@ -1,12 +1,11 @@
 #include "dlg_roll_dice.h"
 
-#include "trice_limits.h"
-
 #include <QDialogButtonBox>
 #include <QLabel>
 #include <QSpinBox>
 #include <QVBoxLayout>
 #include <QWidget>
+#include <libcockatrice/utility/trice_limits.h>
 
 DlgRollDice::DlgRollDice(QWidget *parent) : QDialog(parent)
 {

cockatrice/src/game/game.cpp

@@ -1,7 +1,8 @@
 #include "game.h"
 
 #include "../tabs/tab_game.h"
-#include "pb/event_game_joined.pb.h"
+
+#include <libcockatrice/protocol/pb/event_game_joined.pb.h>
 
 Game::Game(TabGame *_tab,
            QList<AbstractClient *> &_clients,

cockatrice/src/game/game_event_handler.cpp

@@ -1,33 +1,34 @@
 #include "game_event_handler.h"
 
-#include "../server/abstract_client.h"
-#include "../server/pending_command.h"
 #include "../tabs/tab_game.h"
 #include "abstract_game.h"
-#include "get_pb_extension.h"
 #include "log/message_log_widget.h"
-#include "pb/command_concede.pb.h"
+
-#include "pb/command_delete_arrow.pb.h"
+#include <libcockatrice/network/client/abstract/abstract_client.h>
-#include "pb/command_game_say.pb.h"
+#include <libcockatrice/protocol/get_pb_extension.h>
-#include "pb/command_leave_game.pb.h"
+#include <libcockatrice/protocol/pb/command_concede.pb.h>
-#include "pb/command_next_turn.pb.h"
+#include <libcockatrice/protocol/pb/command_delete_arrow.pb.h>
-#include "pb/command_reverse_turn.pb.h"
+#include <libcockatrice/protocol/pb/command_game_say.pb.h>
-#include "pb/command_set_active_phase.pb.h"
+#include <libcockatrice/protocol/pb/command_leave_game.pb.h>
-#include "pb/context_connection_state_changed.pb.h"
+#include <libcockatrice/protocol/pb/command_next_turn.pb.h>
-#include "pb/context_deck_select.pb.h"
+#include <libcockatrice/protocol/pb/command_reverse_turn.pb.h>
-#include "pb/context_ping_changed.pb.h"
+#include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
-#include "pb/event_game_closed.pb.h"
+#include <libcockatrice/protocol/pb/context_connection_state_changed.pb.h>
-#include "pb/event_game_host_changed.pb.h"
+#include <libcockatrice/protocol/pb/context_deck_select.pb.h>
-#include "pb/event_game_say.pb.h"
+#include <libcockatrice/protocol/pb/context_ping_changed.pb.h>
-#include "pb/event_game_state_changed.pb.h"
+#include <libcockatrice/protocol/pb/event_game_closed.pb.h>
-#include "pb/event_join.pb.h"
+#include <libcockatrice/protocol/pb/event_game_host_changed.pb.h>
-#include "pb/event_kicked.pb.h"
+#include <libcockatrice/protocol/pb/event_game_say.pb.h>
-#include "pb/event_leave.pb.h"
+#include <libcockatrice/protocol/pb/event_game_state_changed.pb.h>
-#include "pb/event_player_properties_changed.pb.h"
+#include <libcockatrice/protocol/pb/event_join.pb.h>
-#include "pb/event_reverse_turn.pb.h"
+#include <libcockatrice/protocol/pb/event_kicked.pb.h>
-#include "pb/event_set_active_phase.pb.h"
+#include <libcockatrice/protocol/pb/event_leave.pb.h>
-#include "pb/event_set_active_player.pb.h"
+#include <libcockatrice/protocol/pb/event_player_properties_changed.pb.h>
-#include "pb/game_event_container.pb.h"
+#include <libcockatrice/protocol/pb/event_reverse_turn.pb.h>
+#include <libcockatrice/protocol/pb/event_set_active_phase.pb.h>
+#include <libcockatrice/protocol/pb/event_set_active_player.pb.h>
+#include <libcockatrice/protocol/pb/game_event_container.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 
 GameEventHandler::GameEventHandler(AbstractGame *_game) : QObject(_game), game(_game)
 {

cockatrice/src/game/game_event_handler.h

@@ -7,12 +7,12 @@
 #ifndef COCKATRICE_GAME_EVENT_HANDLER_H
 #define COCKATRICE_GAME_EVENT_HANDLER_H
 
-#include "pb/event_leave.pb.h"
-#include "pb/serverinfo_player.pb.h"
 #include "player/event_processing_options.h"
 
 #include <QLoggingCategory>
 #include <QObject>
+#include <libcockatrice/protocol/pb/event_leave.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
 
 class AbstractClient;
 class Response;

cockatrice/src/game/game_meta_info.h

@@ -7,10 +7,9 @@
 #ifndef GAME_META_INFO_H
 #define GAME_META_INFO_H
 
-#include "pb/serverinfo_game.pb.h"
-
 #include <QMap>
 #include <QObject>
+#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 
 // Translation layer class to expose protobuf safely and hook it up to Qt Signals.
 // This class de-couples the domain object (i.e. the GameMetaInfo) from the network object.

cockatrice/src/game/game_scene.cpp

@@ -1,6 +1,5 @@
 #include "game_scene.h"
 
-#include "../settings/cache_settings.h"
 #include "board/card_item.h"
 #include "phases_toolbar.h"
 #include "player/player.h"
@@ -15,6 +14,7 @@
 #include <QGraphicsView>
 #include <QSet>
 #include <QtMath>
+#include <libcockatrice/settings/cache_settings.h>
 #include <numeric>
 
 /**

cockatrice/src/game/game_state.h

@@ -7,11 +7,10 @@
 #ifndef COCKATRICE_GAME_STATE_H
 #define COCKATRICE_GAME_STATE_H
 
-#include "../server/abstract_client.h"
-#include "pb/serverinfo_game.pb.h"
-
 #include <QObject>
 #include <QTimer>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <libcockatrice/protocol/pb/serverinfo_game.pb.h>
 
 class AbstractGame;
 class ServerInfo_PlayerProperties;

cockatrice/src/game/game_view.cpp

@@ -1,11 +1,11 @@
 #include "game_view.h"
 
-#include "../settings/cache_settings.h"
 #include "game_scene.h"
 
 #include <QAction>
 #include <QResizeEvent>
 #include <QRubberBand>
+#include <libcockatrice/settings/cache_settings.h>
 
 GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, parent), rubberBand(0)
 {

cockatrice/src/game/log/message_log_widget.cpp

@@ -1,17 +1,17 @@
 #include "message_log_widget.h"
 
 #include "../../client/sound_engine.h"
-#include "../../settings/card_counter_settings.h"
 #include "../../tabs/tab_game.h"
 #include "../board/card_item.h"
 #include "../board/translate_counter_name.h"
 #include "../phase.h"
 #include "../player/player.h"
 #include "../zones/card_zone.h"
-#include "pb/context_move_card.pb.h"
-#include "pb/context_mulligan.pb.h"
-#include "pb/serverinfo_user.pb.h"
 
+#include <libcockatrice/protocol/pb/context_move_card.pb.h>
+#include <libcockatrice/protocol/pb/context_mulligan.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <libcockatrice/settings/card_counter_settings.h>
 #include <utility>
 
 static const QString TABLE_ZONE_NAME = "table";

cockatrice/src/game/log/message_log_widget.h

@@ -10,7 +10,8 @@
 #include "../../client/translation.h"
 #include "../../server/chat_view/chat_view.h"
 #include "../zones/logic/card_zone_logic.h"
-#include "user_level.h"
+
+#include <libcockatrice/network/server/remote/user_level.h>
 
 class AbstractGame;
 class CardItem;

cockatrice/src/game/phases_toolbar.cpp

@@ -1,16 +1,16 @@
 #include "phases_toolbar.h"
 
 #include "../interface/pixel_map_generator.h"
-#include "pb/command_draw_cards.pb.h"
-#include "pb/command_next_turn.pb.h"
-#include "pb/command_set_active_phase.pb.h"
-#include "pb/command_set_card_attr.pb.h"
 
 #include <QAction>
 #include <QDebug>
 #include <QPainter>
 #include <QPen>
 #include <QTimer>
+#include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
+#include <libcockatrice/protocol/pb/command_next_turn.pb.h>
+#include <libcockatrice/protocol/pb/command_set_active_phase.pb.h>
+#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
 
 PhaseButton::PhaseButton(const QString &_name, QGraphicsItem *parent, QAction *_doubleClickAction, bool _highlightable)
     : QObject(), QGraphicsItem(parent), name(_name), active(false), highlightable(_highlightable),

cockatrice/src/game/player/menu/card_menu.cpp

@@ -1,8 +1,5 @@
 #include "card_menu.h"
 
-#include "../../../card/card_relation.h"
-#include "../../../database/card_database_manager.h"
-#include "../../../settings/card_counter_settings.h"
 #include "../../../tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../../zones/logic/view_zone_logic.h"
@@ -12,6 +9,10 @@
 #include "move_menu.h"
 #include "pt_menu.h"
 
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/card/card_relation/card_relation.h>
+#include <libcockatrice/settings/card_counter_settings.h>
+
 CardMenu::CardMenu(Player *_player, const CardItem *_card, bool _shortcutsActive)
     : player(_player), card(_card), shortcutsActive(_shortcutsActive)
 {

cockatrice/src/game/player/menu/hand_menu.cpp

@@ -1,7 +1,5 @@
 #include "hand_menu.h"
 
-#include "../../../settings/cache_settings.h"
-#include "../../../settings/shortcuts_settings.h"
 #include "../../abstract_game.h"
 #include "../../zones/hand_zone.h"
 #include "../player.h"
@@ -9,6 +7,8 @@
 
 #include <QAction>
 #include <QMenu>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/settings/shortcuts_settings.h>
 
 HandMenu::HandMenu(Player *_player, PlayerActions *actions, QWidget *parent) : TearOffMenu(parent), player(_player)
 {

cockatrice/src/game/player/menu/library_menu.cpp

@@ -1,7 +1,5 @@
 #include "library_menu.h"
 
-#include "../../../settings/cache_settings.h"
-#include "../../../settings/shortcuts_settings.h"
 #include "../../../tabs/tab_game.h"
 #include "../../abstract_game.h"
 #include "../player.h"
@@ -9,6 +7,8 @@
 
 #include <QAction>
 #include <QMenu>
+#include <libcockatrice/settings/cache_settings.h>
+#include <libcockatrice/settings/shortcuts_settings.h>
 
 LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player)
 {

cockatrice/src/game/player/menu/player_menu.cpp

@@ -1,7 +1,5 @@
 #include "player_menu.h"
 
-#include "../../../common/pb/command_reveal_cards.pb.h"
-#include "../../../database/card_database_manager.h"
 #include "../../../tabs/tab_game.h"
 #include "../../board/card_item.h"
 #include "../../zones/hand_zone.h"
@@ -10,6 +8,9 @@
 #include "card_menu.h"
 #include "hand_menu.h"
 
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
+
 PlayerMenu::PlayerMenu(Player *_player) : player(_player)
 {
     playerMenu = new TearOffMenu();

cockatrice/src/game/player/menu/say_menu.cpp

@@ -1,9 +1,10 @@
 #include "say_menu.h"
 
-#include "../../../settings/cache_settings.h"
 #include "../player.h"
 #include "../player_actions.h"
 
+#include <libcockatrice/settings/cache_settings.h>
+
 SayMenu::SayMenu(Player *_player) : player(_player)
 {
     connect(&SettingsCache::instance().messages(), &MessageSettings::messageMacrosChanged, this, &SayMenu::initSayMenu);

cockatrice/src/game/player/player.cpp

@@ -12,15 +12,6 @@
 #include "../zones/stack_zone.h"
 #include "../zones/table_zone.h"
 #include "../zones/view_zone.h"
-#include "color.h"
-#include "pb/command_attach_card.pb.h"
-#include "pb/command_set_card_counter.pb.h"
-#include "pb/event_create_arrow.pb.h"
-#include "pb/event_create_counter.pb.h"
-#include "pb/event_draw_cards.pb.h"
-#include "pb/serverinfo_player.pb.h"
-#include "pb/serverinfo_user.pb.h"
-#include "pb/serverinfo_zone.pb.h"
 #include "player_target.h"
 
 #include <QDebug>
@@ -28,6 +19,15 @@
 #include <QMetaType>
 #include <QPainter>
 #include <QtConcurrent>
+#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
+#include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_create_arrow.pb.h>
+#include <libcockatrice/protocol/pb/event_create_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_draw_cards.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_player.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_zone.pb.h>
+#include <libcockatrice/utility/color.h>
 
 Player::Player(const ServerInfo_User &info, int _id, bool _local, bool _judge, AbstractGame *_parent)
     : QObject(_parent), game(_parent), playerInfo(new PlayerInfo(info, _id, _local, _judge)),

cockatrice/src/game/player/player.h

@@ -7,14 +7,11 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
-#include "../../card/card_info.h"
 #include "../../filters/filter_string.h"
 #include "../../interface/tearoff_menu.h"
 #include "../board/abstract_graphics_item.h"
 #include "../dialogs/dlg_create_token.h"
 #include "menu/player_menu.h"
-#include "pb/card_attributes.pb.h"
-#include "pb/game_event.pb.h"
 #include "player_actions.h"
 #include "player_area.h"
 #include "player_event_handler.h"
@@ -26,6 +23,9 @@
 #include <QMap>
 #include <QPoint>
 #include <QTimer>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/protocol/pb/card_attributes.pb.h>
+#include <libcockatrice/protocol/pb/game_event.pb.h>
 
 inline Q_LOGGING_CATEGORY(PlayerLog, "player");
 

cockatrice/src/game/player/player_actions.cpp

@@ -1,31 +1,32 @@
 #include "player_actions.h"
 
-#include "../../../common/pb/context_move_card.pb.h"
-#include "../../card/card_relation.h"
 #include "../../client/get_text_with_max.h"
-#include "../../database/card_database_manager.h"
 #include "../../tabs/tab_game.h"
 #include "../board/card_item.h"
 #include "../dialogs/dlg_move_top_cards_until.h"
 #include "../dialogs/dlg_roll_dice.h"
 #include "../zones/logic/view_zone_logic.h"
 #include "card_menu_action_type.h"
-#include "pb/command_attach_card.pb.h"
+
-#include "pb/command_change_zone_properties.pb.h"
+#include <libcockatrice/card/card_database/card_database_manager.h>
-#include "pb/command_concede.pb.h"
+#include <libcockatrice/card/card_relation/card_relation.h>
-#include "pb/command_create_token.pb.h"
+#include <libcockatrice/protocol/pb/command_attach_card.pb.h>
-#include "pb/command_draw_cards.pb.h"
+#include <libcockatrice/protocol/pb/command_change_zone_properties.pb.h>
-#include "pb/command_flip_card.pb.h"
+#include <libcockatrice/protocol/pb/command_concede.pb.h>
-#include "pb/command_game_say.pb.h"
+#include <libcockatrice/protocol/pb/command_create_token.pb.h>
-#include "pb/command_move_card.pb.h"
+#include <libcockatrice/protocol/pb/command_draw_cards.pb.h>
-#include "pb/command_mulligan.pb.h"
+#include <libcockatrice/protocol/pb/command_flip_card.pb.h>
-#include "pb/command_reveal_cards.pb.h"
+#include <libcockatrice/protocol/pb/command_game_say.pb.h>
-#include "pb/command_roll_die.pb.h"
+#include <libcockatrice/protocol/pb/command_move_card.pb.h>
-#include "pb/command_set_card_attr.pb.h"
+#include <libcockatrice/protocol/pb/command_mulligan.pb.h>
-#include "pb/command_set_card_counter.pb.h"
+#include <libcockatrice/protocol/pb/command_reveal_cards.pb.h>
-#include "pb/command_shuffle.pb.h"
+#include <libcockatrice/protocol/pb/command_roll_die.pb.h>
-#include "pb/command_undo_draw.pb.h"
+#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
-#include "trice_limits.h"
+#include <libcockatrice/protocol/pb/command_set_card_counter.pb.h>
+#include <libcockatrice/protocol/pb/command_shuffle.pb.h>
+#include <libcockatrice/protocol/pb/command_undo_draw.pb.h>
+#include <libcockatrice/protocol/pb/context_move_card.pb.h>
+#include <libcockatrice/utility/trice_limits.h>
 
 // milliseconds in between triggers of the move top cards until action
 static constexpr int MOVE_TOP_CARD_UNTIL_INTERVAL = 100;

cockatrice/src/game/player/player_actions.h

@@ -7,12 +7,13 @@
 
 #ifndef COCKATRICE_PLAYER_ACTIONS_H
 #define COCKATRICE_PLAYER_ACTIONS_H
-#include "../../card/card_relation_type.h"
 #include "event_processing_options.h"
 #include "player.h"
 
 #include <QMenu>
 #include <QObject>
+#include <libcockatrice/card/card_relation/card_relation_type.h>
+#include <libcockatrice/protocol/pb/card_attributes.pb.h>
 
 namespace google
 {

cockatrice/src/game/player/player_event_handler.cpp

@@ -5,30 +5,31 @@
 #include "../board/card_item.h"
 #include "../board/card_list.h"
 #include "../zones/view_zone.h"
-#include "pb/command_set_card_attr.pb.h"
-#include "pb/context_move_card.pb.h"
-#include "pb/context_undo_draw.pb.h"
-#include "pb/event_attach_card.pb.h"
-#include "pb/event_change_zone_properties.pb.h"
-#include "pb/event_create_arrow.pb.h"
-#include "pb/event_create_counter.pb.h"
-#include "pb/event_create_token.pb.h"
-#include "pb/event_del_counter.pb.h"
-#include "pb/event_delete_arrow.pb.h"
-#include "pb/event_destroy_card.pb.h"
-#include "pb/event_draw_cards.pb.h"
-#include "pb/event_dump_zone.pb.h"
-#include "pb/event_flip_card.pb.h"
-#include "pb/event_game_say.pb.h"
-#include "pb/event_move_card.pb.h"
-#include "pb/event_reveal_cards.pb.h"
-#include "pb/event_roll_die.pb.h"
-#include "pb/event_set_card_attr.pb.h"
-#include "pb/event_set_card_counter.pb.h"
-#include "pb/event_set_counter.pb.h"
-#include "pb/event_shuffle.pb.h"
 #include "player.h"
 
+#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
+#include <libcockatrice/protocol/pb/context_move_card.pb.h>
+#include <libcockatrice/protocol/pb/context_undo_draw.pb.h>
+#include <libcockatrice/protocol/pb/event_attach_card.pb.h>
+#include <libcockatrice/protocol/pb/event_change_zone_properties.pb.h>
+#include <libcockatrice/protocol/pb/event_create_arrow.pb.h>
+#include <libcockatrice/protocol/pb/event_create_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_create_token.pb.h>
+#include <libcockatrice/protocol/pb/event_del_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_delete_arrow.pb.h>
+#include <libcockatrice/protocol/pb/event_destroy_card.pb.h>
+#include <libcockatrice/protocol/pb/event_draw_cards.pb.h>
+#include <libcockatrice/protocol/pb/event_dump_zone.pb.h>
+#include <libcockatrice/protocol/pb/event_flip_card.pb.h>
+#include <libcockatrice/protocol/pb/event_game_say.pb.h>
+#include <libcockatrice/protocol/pb/event_move_card.pb.h>
+#include <libcockatrice/protocol/pb/event_reveal_cards.pb.h>
+#include <libcockatrice/protocol/pb/event_roll_die.pb.h>
+#include <libcockatrice/protocol/pb/event_set_card_attr.pb.h>
+#include <libcockatrice/protocol/pb/event_set_card_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_set_counter.pb.h>
+#include <libcockatrice/protocol/pb/event_shuffle.pb.h>
+
 PlayerEventHandler::PlayerEventHandler(Player *_player) : player(_player)
 {
 }

cockatrice/src/game/player/player_event_handler.h

@@ -9,8 +9,8 @@
 #include "event_processing_options.h"
 
 #include <QObject>
-#include <pb/game_event.pb.h>
+#include <libcockatrice/protocol/pb/game_event.pb.h>
-#include <pb/game_event_context.pb.h>
+#include <libcockatrice/protocol/pb/game_event_context.pb.h>
 
 class CardItem;
 class CardZoneLogic;

cockatrice/src/game/player/player_info.h

@@ -7,7 +7,6 @@
 #ifndef COCKATRICE_PLAYER_INFO_H
 #define COCKATRICE_PLAYER_INFO_H
 
-#include "../../../common/pb/serverinfo_user.pb.h"
 #include "../../deck/deck_loader.h"
 #include "../zones/hand_zone.h"
 #include "../zones/pile_zone.h"
@@ -16,6 +15,7 @@
 #include "player_target.h"
 
 #include <QObject>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class PlayerInfo : public QObject
 {

cockatrice/src/game/player/player_list_widget.cpp

@@ -1,21 +1,21 @@
 #include "player_list_widget.h"
 
 #include "../../interface/pixel_map_generator.h"
-#include "../../server/abstract_client.h"
 #include "../../server/user/user_context_menu.h"
 #include "../../server/user/user_list_manager.h"
 #include "../../server/user/user_list_widget.h"
 #include "../../tabs/tab_account.h"
 #include "../../tabs/tab_game.h"
 #include "../../tabs/tab_supervisor.h"
-#include "pb/command_kick_from_game.pb.h"
-#include "pb/serverinfo_playerproperties.pb.h"
-#include "pb/session_commands.pb.h"
 
 #include <QAction>
 #include <QHeaderView>
 #include <QMenu>
 #include <QMouseEvent>
+#include <libcockatrice/network/client/abstract/abstract_client.h>
+#include <libcockatrice/protocol/pb/command_kick_from_game.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
+#include <libcockatrice/protocol/pb/session_commands.pb.h>
 
 PlayerListItemDelegate::PlayerListItemDelegate(QObject *const parent) : QStyledItemDelegate(parent)
 {

cockatrice/src/game/player/player_manager.h

@@ -7,10 +7,9 @@
 #ifndef COCKATRICE_PLAYER_MANAGER_H
 #define COCKATRICE_PLAYER_MANAGER_H
 
-#include "pb/serverinfo_playerproperties.pb.h"
-
 #include <QMap>
 #include <QObject>
+#include <libcockatrice/protocol/pb/serverinfo_playerproperties.pb.h>
 
 class AbstractGame;
 class Player;

cockatrice/src/game/player/player_target.cpp

@@ -1,13 +1,13 @@
 #include "player_target.h"
 
 #include "../../interface/pixel_map_generator.h"
-#include "pb/serverinfo_user.pb.h"
 #include "player.h"
 
 #include <QDebug>
 #include <QPainter>
 #include <QPixmapCache>
 #include <QtMath>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 PlayerCounter::PlayerCounter(Player *_player, int _id, const QString &_name, int _value, QGraphicsItem *parent)
     : AbstractCounter(_player, _id, _name, false, _value, false, parent)

cockatrice/src/game/zones/hand_zone.cpp

@@ -1,13 +1,13 @@
 #include "hand_zone.h"
 
 #include "../../interface/theme_manager.h"
-#include "../../settings/cache_settings.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
-#include "pb/command_move_card.pb.h"
 
 #include <QPainter>
+#include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/settings/cache_settings.h>
 
 HandZone::HandZone(HandZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
     : SelectZone(_logic, parent), zoneHeight(_zoneHeight)

cockatrice/src/game/zones/logic/card_zone_logic.cpp

@@ -1,16 +1,16 @@
 #include "card_zone_logic.h"
 
-#include "../../../database/card_database_manager.h"
 #include "../../board/card_item.h"
 #include "../../player/player.h"
 #include "../pile_zone.h"
 #include "../view_zone.h"
-#include "pb/command_move_card.pb.h"
-#include "pb/serverinfo_user.pb.h"
 #include "view_zone_logic.h"
 
 #include <QAction>
 #include <QDebug>
+#include <libcockatrice/card/card_database/card_database_manager.h>
+#include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 /**
  * @param _player the player that the zone belongs to

cockatrice/src/game/zones/logic/view_zone_logic.cpp

@@ -1,8 +1,9 @@
 #include "view_zone_logic.h"
 
-#include "../../../settings/cache_settings.h"
 #include "../../board/card_item.h"
 
+#include <libcockatrice/settings/cache_settings.h>
+
 /**
  * @param _player the player that the cards are revealed to.
  * @param _origZone the zone the cards were revealed from.

cockatrice/src/game/zones/pile_zone.cpp

@@ -4,12 +4,12 @@
 #include "../board/card_item.h"
 #include "../player/player.h"
 #include "logic/pile_zone_logic.h"
-#include "pb/command_move_card.pb.h"
 #include "view_zone.h"
 
 #include <QApplication>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
+#include <libcockatrice/protocol/pb/command_move_card.pb.h>
 
 PileZone::PileZone(PileZoneLogic *_logic, QGraphicsItem *parent) : CardZone(_logic, parent)
 {

cockatrice/src/game/zones/select_zone.cpp

@@ -1,11 +1,11 @@
 #include "select_zone.h"
 
-#include "../../settings/cache_settings.h"
 #include "../board/card_item.h"
 #include "../game_scene.h"
 
 #include <QDebug>
 #include <QGraphicsSceneMouseEvent>
+#include <libcockatrice/settings/cache_settings.h>
 
 qreal divideCardSpaceInZone(qreal index, int cardCount, qreal totalHeight, qreal cardHeight, bool reverse)
 {

cockatrice/src/game/zones/stack_zone.cpp

@@ -1,16 +1,16 @@
 #include "stack_zone.h"
 
 #include "../../interface/theme_manager.h"
-#include "../../settings/cache_settings.h"
 #include "../board/arrow_item.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
 #include "logic/stack_zone_logic.h"
-#include "pb/command_move_card.pb.h"
 
 #include <QPainter>
 #include <QSet>
+#include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/settings/cache_settings.h>
 
 StackZone::StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent)
     : SelectZone(_logic, parent), zoneHeight(_zoneHeight)

cockatrice/src/game/zones/table_zone.cpp

@@ -1,19 +1,19 @@
 #include "table_zone.h"
 
-#include "../../card/card_info.h"
 #include "../../interface/theme_manager.h"
-#include "../../settings/cache_settings.h"
 #include "../board/arrow_item.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
 #include "logic/table_zone_logic.h"
-#include "pb/command_move_card.pb.h"
-#include "pb/command_set_card_attr.pb.h"
 
 #include <QGraphicsScene>
 #include <QPainter>
 #include <QSet>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/protocol/pb/command_set_card_attr.pb.h>
+#include <libcockatrice/settings/cache_settings.h>
 
 const QColor TableZone::BACKGROUND_COLOR = QColor(100, 100, 100);
 const QColor TableZone::FADE_MASK = QColor(0, 0, 0, 80);

cockatrice/src/game/zones/view_zone.cpp

@@ -1,21 +1,21 @@
 #include "view_zone.h"
 
-#include "../../card/card_info.h"
-#include "../../server/pending_command.h"
 #include "../board/card_drag_item.h"
 #include "../board/card_item.h"
 #include "../player/player.h"
 #include "logic/view_zone_logic.h"
-#include "pb/command_dump_zone.pb.h"
-#include "pb/command_move_card.pb.h"
-#include "pb/response_dump_zone.pb.h"
-#include "pb/serverinfo_card.pb.h"
 
 #include <QBrush>
 #include <QDebug>
 #include <QGraphicsSceneWheelEvent>
 #include <QPainter>
 #include <QtMath>
+#include <libcockatrice/card/card_info.h>
+#include <libcockatrice/protocol/pb/command_dump_zone.pb.h>
+#include <libcockatrice/protocol/pb/command_move_card.pb.h>
+#include <libcockatrice/protocol/pb/response_dump_zone.pb.h>
+#include <libcockatrice/protocol/pb/serverinfo_card.pb.h>
+#include <libcockatrice/protocol/pending_command.h>
 
 /**
  * @param parent the parent QGraphicsWidget containing the reveal zone

cockatrice/src/game/zones/view_zone.h

@@ -13,7 +13,7 @@
 
 #include <QGraphicsLayoutItem>
 #include <QLoggingCategory>
-#include <pb/commands.pb.h>
+#include <libcockatrice/protocol/pb/commands.pb.h>
 
 inline Q_LOGGING_CATEGORY(ViewZoneLog, "view_zone");
 

cockatrice/src/game/zones/view_zone_widget.cpp

@@ -2,11 +2,9 @@
 
 #include "../../filters/syntax_help.h"
 #include "../../interface/pixel_map_generator.h"
-#include "../../settings/cache_settings.h"
 #include "../board/card_item.h"
 #include "../game_scene.h"
 #include "../player/player.h"
-#include "pb/command_shuffle.pb.h"
 #include "view_zone.h"
 
 #include <QCheckBox>
@@ -18,6 +16,8 @@
 #include <QScrollBar>
 #include <QStyleOption>
 #include <QStyleOptionTitleBar>
+#include <libcockatrice/protocol/pb/command_shuffle.pb.h>
+#include <libcockatrice/settings/cache_settings.h>
 
 /**
  * @param _player the player the cards were revealed to.

cockatrice/src/game/zones/view_zone_widget.h

@@ -7,7 +7,6 @@
 #ifndef ZONEVIEWWIDGET_H
 #define ZONEVIEWWIDGET_H
 
-#include "../../utility/macros.h"
 #include "logic/card_zone_logic.h"
 
 #include <QCheckBox>
@@ -15,6 +14,7 @@
 #include <QGraphicsProxyWidget>
 #include <QGraphicsWidget>
 #include <QLineEdit>
+#include <libcockatrice/utility/macros.h>
 
 class QLabel;
 class QPushButton;