Fix pbs and some other stuff.

Took 1 hour 5 minutes

libs/deck_list/CMakeLists.txt

@@ -16,7 +16,7 @@ elseif (Qt5_FOUND)
     qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
 endif ()
 
-qt_add_library(cardlib STATIC
+qt_add_library(cockatrice_deck_list STATIC
     src/abstract_deck_list_card_node.cpp
     src/abstract_deck_list_node.cpp
     src/deck_list.cpp
@@ -25,12 +25,11 @@ qt_add_library(cardlib STATIC
     ${MOC_SOURCES}
 )
 
-target_include_directories(deck_list
+target_include_directories(cockatrice_deck_list
     PUBLIC include
     PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include
 )
 
-target_link_libraries(deck_list
-    utility
-    PUBLIC ${COCKATRICE_QT_MODULES}
+target_link_libraries(cockatrice_deck_list
+    PUBLIC utility ${COCKATRICE_QT_MODULES}
 )

libs/pb/CMakeLists.txt

@@ -190,8 +190,8 @@ if(${Protobuf_VERSION} VERSION_LESS "3.21.0.0")
 else()
   add_library(cockatrice_protocol ${PROTO_FILES})
   target_link_libraries(cockatrice_protocol PUBLIC protobuf::libprotobuf)
-  set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-  target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}")
+  set(PROTO_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/pb")
+  target_include_directories(cockatrice_protocol PUBLIC "${PROTOBUF_INCLUDE_DIRS}" PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 
   protobuf_generate(
     TARGET cockatrice_protocol IMPORT_DIRS "${CMAKE_CURRENT_LIST_DIR}" PROTOC_OUT_DIR "${PROTO_BINARY_DIR}"

libs/rng/CMakeLists.txt

@@ -24,4 +24,7 @@ add_library(cockatrice_rng STATIC
 target_include_directories(cockatrice_rng
     PUBLIC include
     PUBLIC include/sfmt
+)
+
+target_link_libraries(cockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES}
 )

libs/server/CMakeLists.txt

@@ -3,23 +3,25 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 set(HEADERS
-    include/game/server_abstract_participant.h
-    include/game/server_arrow.h
-    include/game/server_arrowtarget.h
-    include/game/server_card.h
-    include/game/server_cardzone.h
-    include/game/server_counter.h
-    include/game/server_game.h
-    include/game/server_player.h
-    include/game/server_spectator.h
-    include/server.h
-    include/server_abstractuserinterface.h
-    include/server_database_interface.h
-    include/server_protocolhandler.h
-    include/server_remoteuserinterface.h
-    include/server_response_containers.h
-    include/server_room.h
-    include/serverinfo_user_container.h
+    include/server/game/server_abstract_participant.h
+    include/server/game/server_arrow.h
+    include/server/game/server_arrowtarget.h
+    include/server/game/server_card.h
+    include/server/game/server_cardzone.h
+    include/server/game/server_counter.h
+    include/server/game/server_game.h
+    include/server/game/server_player.h
+    include/server/game/server_spectator.h
+    include/server/debug_pb_message.h
+    include/server/get_pb_extension.h
+    include/server/server.h
+    include/server/server_abstractuserinterface.h
+    include/server/server_database_interface.h
+    include/server/server_protocolhandler.h
+    include/server/server_remoteuserinterface.h
+    include/server/server_response_containers.h
+    include/server/server_room.h
+    include/server/serverinfo_user_container.h
 )
 
 if (Qt6_FOUND)
@@ -38,6 +40,8 @@ add_library(serverlib STATIC
     src/game/server_game.cpp
     src/game/server_player.cpp
     src/game/server_spectator.cpp
+    src/debug_pb_message.cpp
+    src/get_pb_extension.cpp
     src/server.cpp
     src/server_abstractuserinterface.cpp
     src/server_database_interface.cpp
@@ -54,9 +58,10 @@ target_include_directories(serverlib
     PUBLIC ${CMAKE_SOURCE_DIR}/common
     PUBLIC ${CMAKE_SOURCE_DIR}/libs/pb
     PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility
+    PUBLIC ${CMAKE_BINARY_DIR}/libs/pb
 )
 
 # Make serverlib depend on cockatrice_protocol
 target_link_libraries(serverlib
-    PUBLIC cockatrice_common cockatrice_protocol utility ${COCKATRICE_QT_MODULES}
+    PUBLIC cockatrice_common cockatrice_protocol utility cockatrice_rng cockatrice_deck_list ${COCKATRICE_QT_MODULES}
 )

libs/server/include/server/server_room.h

@@ -1,9 +1,9 @@
 #ifndef SERVER_ROOM_H
 #define SERVER_ROOM_H
 
-#include "../serverinfo_user_container.h"
 #include "pb/response.pb.h"
 #include "pb/serverinfo_chat_message.pb.h"
+#include "serverinfo_user_container.h"
 
 #include <QList>
 #include <QMap>

libs/server/src/debug_pb_message.cpp

@@ -1,6 +1,6 @@
-#include "../../common/debug_pb_message.h"
+#include "../include/server/debug_pb_message.h"
 
-#include "../utility/include/utility/trice_limits.h"
+#include "utility/trice_limits.h"
 
 #include <QList>
 #include <QString>

libs/server/src/game/server_abstract_participant.cpp

@@ -1,21 +1,18 @@
-#include "../../include/game/server_abstract_participant.h"
+#include "../../include/server/game/server_abstract_participant.h"
 
-#include "../../color.h"
-#include "../../deck_list.h"
-#include "../../deck_list_card_node.h"
-#include "../../game/server_arrow.h"
-#include "../../game/server_counter.h"
-#include "../../get_pb_extension.h"
-#include "../../include/game/server_card.h"
-#include "../../include/game/server_cardzone.h"
-#include "../../include/game/server_game.h"
-#include "../../include/game/server_player.h"
-#include "../../rng_abstract.h"
-#include "../../trice_limits.h"
-#include "../server.h"
-#include "../server_abstractuserinterface.h"
-#include "../server_database_interface.h"
-#include "../server_room.h"
+#include "../../include/server/game/server_arrow.h"
+#include "../../include/server/game/server_card.h"
+#include "../../include/server/game/server_cardzone.h"
+#include "../../include/server/game/server_counter.h"
+#include "../../include/server/game/server_game.h"
+#include "../../include/server/game/server_player.h"
+#include "../../include/server/get_pb_extension.h"
+#include "../../include/server/server.h"
+#include "../../include/server/server_database_interface.h"
+#include "../../include/server/server_room.h"
+#include "../include/server/server_abstractuserinterface.h"
+#include "deck_list/deck_list.h"
+#include "deck_list/deck_list_card_node.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_change_zone_properties.pb.h"
 #include "pb/command_concede.pb.h"
@@ -82,6 +79,9 @@
 #include "pb/response_dump_zone.pb.h"
 #include "pb/serverinfo_player.pb.h"
 #include "pb/serverinfo_user.pb.h"
+#include "rng/rng_abstract.h"
+#include "utility/color.h"
+#include "utility/trice_limits.h"
 
 #include <QDebug>
 #include <QRegularExpression>

libs/server/src/game/server_arrow.cpp

@@ -1,8 +1,8 @@
-#include "../../include/game/server_arrow.h"
+#include "../../include/server/game/server_arrow.h"
 
-#include "../../include/game/server_card.h"
-#include "../../include/game/server_cardzone.h"
-#include "../../include/game/server_player.h"
+#include "../../include/server/game/server_card.h"
+#include "../../include/server/game/server_cardzone.h"
+#include "../../include/server/game/server_player.h"
 #include "pb/serverinfo_arrow.pb.h"
 
 Server_Arrow::Server_Arrow(int _id, Server_Card *_startCard, Server_ArrowTarget *_targetItem, const color &_arrowColor)

libs/server/src/game/server_arrowtarget.cpp

@@ -1,2 +1,2 @@
 
-#include "../../include/game/server_arrowtarget.h"
+#include "../../include/server/game/server_arrowtarget.h"

libs/server/src/game/server_card.cpp

@@ -17,10 +17,10 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "../../include/game/server_card.h"
+#include "../../include/server/game/server_card.h"
 
-#include "../../include/game/server_cardzone.h"
-#include "../../include/game/server_player.h"
+#include "../../include/server/game/server_cardzone.h"
+#include "../../include/server/game/server_player.h"
 #include "pb/event_set_card_attr.pb.h"
 #include "pb/event_set_card_counter.pb.h"
 #include "pb/serverinfo_card.pb.h"

libs/server/src/game/server_cardzone.cpp

@@ -17,12 +17,12 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "../../include/game/server_cardzone.h"
+#include "../../include/server/game/server_cardzone.h"
 
-#include "../../include/game/server_card.h"
-#include "../../include/game/server_player.h"
-#include "../rng_abstract.h"
+#include "../../include/server/game/server_card.h"
+#include "../../include/server/game/server_player.h"
 #include "pb/command_move_card.pb.h"
+#include "rng/rng_abstract.h"
 
 #include <QDebug>
 #include <QSet>

libs/server/src/game/server_counter.cpp

@@ -1,4 +1,4 @@
-#include "../../include/game/server_counter.h"
+#include "../../include/server/game/server_counter.h"
 
 #include "pb/serverinfo_counter.pb.h"
 

libs/server/src/game/server_game.cpp

@@ -17,18 +17,18 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "../../include/game/server_game.h"
+#include "../../include/server/game/server_game.h"
 
-#include "../../deck_list.h"
-#include "../../include/game/server_arrow.h"
-#include "../../include/game/server_card.h"
-#include "../../include/game/server_cardzone.h"
-#include "../../include/game/server_player.h"
-#include "../../include/game/server_spectator.h"
-#include "../server.h"
-#include "../server_database_interface.h"
-#include "../server_protocolhandler.h"
-#include "../server_room.h"
+#include "../../include/server/game/server_arrow.h"
+#include "../../include/server/game/server_card.h"
+#include "../../include/server/game/server_cardzone.h"
+#include "../../include/server/game/server_player.h"
+#include "../../include/server/game/server_spectator.h"
+#include "../../include/server/server.h"
+#include "../../include/server/server_database_interface.h"
+#include "../../include/server/server_protocolhandler.h"
+#include "../../include/server/server_room.h"
+#include "deck_list/deck_list.h"
 #include "pb/context_connection_state_changed.pb.h"
 #include "pb/context_deck_select.pb.h"
 #include "pb/context_ping_changed.pb.h"

libs/server/src/game/server_player.cpp

@@ -1,20 +1,17 @@
-#include "../../include/game/server_player.h"
+#include "../../include/server/game/server_player.h"
 
-#include "../../color.h"
-#include "../../deck_list.h"
-#include "../../deck_list_card_node.h"
-#include "../../get_pb_extension.h"
-#include "../../include/game/server_arrow.h"
-#include "../../include/game/server_card.h"
-#include "../../include/game/server_cardzone.h"
-#include "../../include/game/server_counter.h"
-#include "../../include/game/server_game.h"
-#include "../../rng_abstract.h"
-#include "../../trice_limits.h"
-#include "../server.h"
-#include "../server_abstractuserinterface.h"
-#include "../server_database_interface.h"
-#include "../server_room.h"
+#include "../../include/server/game/server_arrow.h"
+#include "../../include/server/game/server_card.h"
+#include "../../include/server/game/server_cardzone.h"
+#include "../../include/server/game/server_counter.h"
+#include "../../include/server/game/server_game.h"
+#include "../../include/server/get_pb_extension.h"
+#include "../../include/server/server.h"
+#include "../../include/server/server_database_interface.h"
+#include "../../include/server/server_room.h"
+#include "../include/server/server_abstractuserinterface.h"
+#include "deck_list/deck_list.h"
+#include "deck_list/deck_list_card_node.h"
 #include "pb/command_attach_card.pb.h"
 #include "pb/command_change_zone_properties.pb.h"
 #include "pb/command_concede.pb.h"
@@ -81,6 +78,9 @@
 #include "pb/response_dump_zone.pb.h"
 #include "pb/serverinfo_player.pb.h"
 #include "pb/serverinfo_user.pb.h"
+#include "rng/rng_abstract.h"
+#include "utility/color.h"
+#include "utility/trice_limits.h"
 
 #include <QDebug>
 #include <QRegularExpression>

libs/server/src/game/server_spectator.cpp

@@ -1,4 +1,4 @@
-#include "../../include/game/server_spectator.h"
+#include "../../include/server/game/server_spectator.h"
 
 Server_Spectator::Server_Spectator(Server_Game *_game,
                                    int _playerId,

libs/server/src/get_pb_extension.cpp

@@ -1,4 +1,4 @@
-#include "get_pb_extension.h"
+#include "../include/server/get_pb_extension.h"
 
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/message.h>

libs/server/src/server.cpp

@@ -17,22 +17,22 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include "../include/server.h"
+#include "../include/server/server.h"
 
-#include "../debug_pb_message.h"
-#include "../featureset.h"
-#include "../include/game/server_game.h"
-#include "../include/game/server_player.h"
-#include "../include/server_database_interface.h"
-#include "../include/server_protocolhandler.h"
-#include "../include/server_remoteuserinterface.h"
-#include "../include/server_room.h"
+#include "../include/server/debug_pb_message.h"
+#include "../include/server/game/server_game.h"
+#include "../include/server/game/server_player.h"
+#include "../include/server/server_database_interface.h"
+#include "../include/server/server_protocolhandler.h"
+#include "../include/server/server_remoteuserinterface.h"
+#include "../include/server/server_room.h"
 #include "pb/event_connection_closed.pb.h"
 #include "pb/event_list_rooms.pb.h"
 #include "pb/event_user_joined.pb.h"
 #include "pb/event_user_left.pb.h"
 #include "pb/isl_message.pb.h"
 #include "pb/session_event.pb.h"
+#include "utility/featureset.h"
 
 #include <QCoreApplication>
 #include <QDebug>

libs/server/src/server_abstractuserinterface.cpp

@@ -1,11 +1,11 @@
-#include "../include/server_abstractuserinterface.h"
+#include "../include/server/server_abstractuserinterface.h"
 
-#include "../include/game/server_game.h"
-#include "../include/game/server_player.h"
-#include "../include/server.h"
-#include "../include/server_player_reference.h"
-#include "../include/server_response_containers.h"
-#include "../include/server_room.h"
+#include "../include/server/game/server_game.h"
+#include "../include/server/game/server_player.h"
+#include "../include/server/server.h"
+#include "../include/server/server_player_reference.h"
+#include "../include/server/server_response_containers.h"
+#include "../include/server/server_room.h"
 #include "pb/event_game_joined.pb.h"
 #include "pb/event_game_state_changed.pb.h"
 

libs/server/src/server_database_interface.cpp

@@ -1,2 +1,2 @@
 
-#include "../include/server_database_interface.h"
+#include "../include/server/server_database_interface.h"

libs/server/src/server_protocolhandler.cpp

@@ -1,13 +1,11 @@
-#include "../include/server_protocolhandler.h"
+#include "../include/server/server_protocolhandler.h"
 
-#include "../debug_pb_message.h"
-#include "../featureset.h"
-#include "../get_pb_extension.h"
-#include "../include/game/server_game.h"
-#include "../include/game/server_player.h"
-#include "../include/server_database_interface.h"
-#include "../include/server_room.h"
-#include "../trice_limits.h"
+#include "../include/server/debug_pb_message.h"
+#include "../include/server/game/server_game.h"
+#include "../include/server/game/server_player.h"
+#include "../include/server/get_pb_extension.h"
+#include "../include/server/server_database_interface.h"
+#include "../include/server/server_room.h"
 #include "pb/commands.pb.h"
 #include "pb/event_game_joined.pb.h"
 #include "pb/event_list_rooms.pb.h"
@@ -22,6 +20,8 @@
 #include "pb/response_list_users.pb.h"
 #include "pb/response_login.pb.h"
 #include "pb/serverinfo_user.pb.h"
+#include "utility/featureset.h"
+#include "utility/trice_limits.h"
 
 #include <QDateTime>
 #include <QDebug>

libs/server/src/server_remoteuserinterface.cpp

@@ -1,6 +1,6 @@
-#include "../include/server_remoteuserinterface.h"
+#include "../include/server/server_remoteuserinterface.h"
 
-#include "../include/server.h"
+#include "../include/server/server.h"
 #include "pb/serverinfo_user.pb.h"
 
 void Server_RemoteUserInterface::sendProtocolItem(const Response &item)

libs/server/src/server_response_containers.cpp

@@ -1,6 +1,6 @@
-#include "../include/server_response_containers.h"
+#include "../include/server/server_response_containers.h"
 
-#include "../include/game/server_game.h"
+#include "../include/server/game/server_game.h"
 
 #include <google/protobuf/descriptor.h>
 

libs/server/src/server_room.cpp

@@ -1,8 +1,7 @@
-#include "../include/server_room.h"
+#include "../include/server/server_room.h"
 
-#include "../include/game/server_game.h"
-#include "../include/server_protocolhandler.h"
-#include "../trice_limits.h"
+#include "../include/server/game/server_game.h"
+#include "../include/server/server_protocolhandler.h"
 #include "pb/commands.pb.h"
 #include "pb/event_join_room.pb.h"
 #include "pb/event_leave_room.pb.h"
@@ -12,6 +11,7 @@
 #include "pb/room_commands.pb.h"
 #include "pb/serverinfo_chat_message.pb.h"
 #include "pb/serverinfo_room.pb.h"
+#include "utility/trice_limits.h"
 
 #include <QDateTime>
 #include <QDebug>

libs/server/src/serverinfo_user_container.cpp

@@ -1,4 +1,4 @@
-#include "../../common/serverinfo_user_container.h"
+#include "../include/server/serverinfo_user_container.h"
 
 #include "pb/serverinfo_user.pb.h"