Show unknown node in debug screen (#12230)

[dragonfireclient.git] / src / server.h

diff --git a/src/server.h b/src/server.h
index 7b16845afb0d5fcdbea8bcd8cc1de4dd9f21a464..c0539329163c3dcf063e77317dfbc734693e5c87 100644 (file)
--- a/src/server.h
+++ b/src/server.h
@@ -69,6 +69,7 @@ struct SkyboxParams;
 struct SunParams;
 struct MoonParams;
 struct StarParams;
+struct Lighting;
 class ServerThread;
 class ServerModManager;
 class ServerInventoryManager;
@@ -283,6 +284,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        virtual u16 allocateUnknownNodeId(const std::string &name);
        IRollbackManager *getRollbackManager() { return m_rollback; }
        virtual EmergeManager *getEmergeManager() { return m_emerge; }
+       virtual ModMetadataDatabase *getModStorageDatabase() { return m_mod_storage_database; }
 
        IWritableItemDefManager* getWritableItemDefManager();
        NodeDefManager* getWritableNodeDefManager();
@@ -293,13 +295,16 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void getModNames(std::vector<std::string> &modlist);
        std::string getBuiltinLuaPath();
        virtual std::string getWorldPath() const { return m_path_world; }
-       virtual std::string getModStoragePath() const;
 
        inline bool isSingleplayer()
                        { return m_simple_singleplayer_mode; }
 
        inline void setAsyncFatalError(const std::string &error)
                        { m_async_fatal_error.set(error); }
+       inline void setAsyncFatalError(const LuaError &e)
+       {
+               setAsyncFatalError(std::string("Lua: ") + e.what());
+       }
 
        bool showFormspec(const char *name, const std::string &formspec, const std::string &formname);
        Map & getMap() { return m_env->getMap(); }
@@ -329,6 +334,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        void overrideDayNightRatio(RemotePlayer *player, bool do_override, float brightness);
 
+       void setLighting(RemotePlayer *player, const Lighting &lighting);
+
        /* con::PeerHandler implementation. */
        void peerAdded(con::Peer *peer);
        void deletingPeer(con::Peer *peer, bool timeout);
@@ -346,7 +353,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        void printToConsoleOnly(const std::string &text);
 
-       void SendPlayerHPOrDie(PlayerSAO *player, const PlayerHPChangeReason &reason);
+       void HandlePlayerHPChange(PlayerSAO *sao, const PlayerHPChangeReason &reason);
+       void SendPlayerHP(PlayerSAO *sao);
        void SendPlayerBreath(PlayerSAO *sao);
        void SendInventory(PlayerSAO *playerSAO, bool incremental);
        void SendMovePlayer(session_t peer_id);
@@ -373,6 +381,14 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        // Get or load translations for a language
        Translations *getTranslationLanguage(const std::string &lang_code);
 
+       static ModMetadataDatabase *openModStorageDatabase(const std::string &world_path);
+
+       static ModMetadataDatabase *openModStorageDatabase(const std::string &backend,
+                       const std::string &world_path, const Settings &world_mt);
+
+       static bool migrateModStorageDatabase(const GameParams &game_params,
+                       const Settings &cmd_args);
+
        // Bind address
        Address m_bind_addr;
 
@@ -426,7 +442,6 @@ class Server : public con::PeerHandler, public MapEventReceiver,
 
        virtual void SendChatMessage(session_t peer_id, const ChatMessage &message);
        void SendTimeOfDay(session_t peer_id, u16 time, f32 time_speed);
-       void SendPlayerHP(session_t peer_id);
 
        void SendLocalPlayerAnimations(session_t peer_id, v2s32 animation_frames[4],
                f32 animation_speed);
@@ -447,6 +462,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        void SendSetStars(session_t peer_id, const StarParams &params);
        void SendCloudParams(session_t peer_id, const CloudParams &params);
        void SendOverrideDayNightRatio(session_t peer_id, bool do_override, float ratio);
+       void SendSetLighting(session_t peer_id, const Lighting &lighting);
        void broadcastModChannelMessage(const std::string &channel,
                        const std::string &message, session_t from_peer);
 
@@ -498,7 +514,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
                Something random
        */
 
-       void DiePlayer(session_t peer_id, const PlayerHPChangeReason &reason);
+       void HandlePlayerDeath(PlayerSAO* sao, const PlayerHPChangeReason &reason);
        void RespawnPlayer(session_t peer_id);
        void DeleteClient(session_t peer_id, ClientDeletionReason reason);
        void UpdateCrafting(RemotePlayer *player);
@@ -674,6 +690,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
        s32 nextSoundId();
 
        std::unordered_map<std::string, ModMetadata *> m_mod_storages;
+       ModMetadataDatabase *m_mod_storage_database = nullptr;
        float m_mod_storage_save_timer = 10.0f;
 
        // CSM restrictions byteflag