X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fclient.h;h=8b8923f29a56cb6bd5eb5461ae61b0aa4ac40a65;hb=644d0ab2bb44df8a3aefb387736930150b7d0aed;hp=80f4cee406457e3ebf929bed9b93f2099e0b558b;hpb=921151d97a2fb2238ab514324fb95e2732248b96;p=oweals%2Fminetest.git diff --git a/src/client.h b/src/client.h index 80f4cee40..8b8923f29 100644 --- a/src/client.h +++ b/src/client.h @@ -19,7 +19,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once -#include "network/connection.h" #include "clientenvironment.h" #include "irrlichttypes_extrabloated.h" #include @@ -31,25 +30,29 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "gamedef.h" #include "inventorymanager.h" #include "localplayer.h" -#include "hud.h" +#include "client/hud.h" #include "particles.h" #include "mapnode.h" #include "tileanimation.h" #include "mesh_generator_thread.h" +#include "network/address.h" +#include "network/peerhandler.h" #include #define CLIENT_CHAT_MESSAGE_LIMIT_PER_10S 10.0f +struct ClientEvent; struct MeshMakeData; struct ChatMessage; class MapBlockMesh; class IWritableTextureSource; class IWritableShaderSource; class IWritableItemDefManager; -class IWritableNodeDefManager; +class NodeDefManager; //class IWritableCraftDefManager; class ClientMediaDownloader; struct MapDrawControl; +class ModChannelMgr; class MtEventManager; struct PointedThing; class MapDatabase; @@ -57,6 +60,9 @@ class Minimap; struct MinimapMapblock; class Camera; class NetworkPacket; +namespace con { +class Connection; +} enum LocalClientState { LC_Created, @@ -64,137 +70,6 @@ enum LocalClientState { LC_Ready }; -enum ClientEventType -{ - CE_NONE, - CE_PLAYER_DAMAGE, - CE_PLAYER_FORCE_MOVE, - CE_DEATHSCREEN, - CE_SHOW_FORMSPEC, - CE_SHOW_LOCAL_FORMSPEC, - CE_SPAWN_PARTICLE, - CE_ADD_PARTICLESPAWNER, - CE_DELETE_PARTICLESPAWNER, - CE_HUDADD, - CE_HUDRM, - CE_HUDCHANGE, - CE_SET_SKY, - CE_OVERRIDE_DAY_NIGHT_RATIO, - CE_CLOUD_PARAMS, -}; - -struct ClientEvent -{ - ClientEventType type; - union{ - //struct{ - //} none; - struct{ - u8 amount; - } player_damage; - struct{ - f32 pitch; - f32 yaw; - } player_force_move; - struct{ - bool set_camera_point_target; - f32 camera_point_target_x; - f32 camera_point_target_y; - f32 camera_point_target_z; - } deathscreen; - struct{ - std::string *formspec; - std::string *formname; - } show_formspec; - //struct{ - //} textures_updated; - struct{ - v3f *pos; - v3f *vel; - v3f *acc; - f32 expirationtime; - f32 size; - bool collisiondetection; - bool collision_removal; - bool vertical; - std::string *texture; - struct TileAnimationParams animation; - u8 glow; - } spawn_particle; - struct{ - u16 amount; - f32 spawntime; - v3f *minpos; - v3f *maxpos; - v3f *minvel; - v3f *maxvel; - v3f *minacc; - v3f *maxacc; - f32 minexptime; - f32 maxexptime; - f32 minsize; - f32 maxsize; - bool collisiondetection; - bool collision_removal; - u16 attached_id; - bool vertical; - std::string *texture; - u32 id; - struct TileAnimationParams animation; - u8 glow; - } add_particlespawner; - struct{ - u32 id; - } delete_particlespawner; - struct{ - u32 id; - u8 type; - v2f *pos; - std::string *name; - v2f *scale; - std::string *text; - u32 number; - u32 item; - u32 dir; - v2f *align; - v2f *offset; - v3f *world_pos; - v2s32 * size; - } hudadd; - struct{ - u32 id; - } hudrm; - struct{ - u32 id; - HudElementStat stat; - v2f *v2fdata; - std::string *sdata; - u32 data; - v3f *v3fdata; - v2s32 * v2s32data; - } hudchange; - struct{ - video::SColor *bgcolor; - std::string *type; - std::vector *params; - bool clouds; - } set_sky; - struct{ - bool do_override; - float ratio_f; - } override_day_night_ratio; - struct { - f32 density; - u32 color_bright; - u32 color_ambient; - f32 height; - f32 thickness; - f32 speed_x; - f32 speed_y; - } cloud_params; - }; -}; - /* Packet counter */ @@ -237,7 +112,7 @@ private: }; class ClientScripting; -struct GameUIFlags; +class GameUI; class Client : public con::PeerHandler, public InventoryManager, public IGameDef { @@ -254,18 +129,18 @@ public: IWritableTextureSource *tsrc, IWritableShaderSource *shsrc, IWritableItemDefManager *itemdef, - IWritableNodeDefManager *nodedef, + NodeDefManager *nodedef, ISoundManager *sound, MtEventManager *event, bool ipv6, - GameUIFlags *game_ui_flags + GameUI *game_ui ); ~Client(); DISABLE_CLASS_COPY(Client); // Load local mods into memory - void loadMods(); + void loadBuiltin(); void scanModSubfolder(const std::string &mod_name, const std::string &mod_path, std::string mod_subpath); inline void scanModIntoMemory(const std::string &mod_name, const std::string &mod_path) @@ -273,9 +148,6 @@ public: scanModSubfolder(mod_name, mod_path, ""); } - // Initizle the mods - void initMods(); - /* request all threads managed by client to be stopped */ @@ -310,14 +182,12 @@ public: void handleCommand_AuthAccept(NetworkPacket* pkt); void handleCommand_AcceptSudoMode(NetworkPacket* pkt); void handleCommand_DenySudoMode(NetworkPacket* pkt); - void handleCommand_InitLegacy(NetworkPacket* pkt); void handleCommand_AccessDenied(NetworkPacket* pkt); void handleCommand_RemoveNode(NetworkPacket* pkt); void handleCommand_AddNode(NetworkPacket* pkt); void handleCommand_BlockData(NetworkPacket* pkt); void handleCommand_Inventory(NetworkPacket* pkt); void handleCommand_TimeOfDay(NetworkPacket* pkt); - void handleCommand_ChatMessageOld(NetworkPacket *pkt); void handleCommand_ChatMessage(NetworkPacket *pkt); void handleCommand_ActiveObjectRemoveAdd(NetworkPacket* pkt); void handleCommand_ActiveObjectMessages(NetworkPacket* pkt); @@ -351,6 +221,8 @@ public: void handleCommand_LocalPlayerAnimations(NetworkPacket* pkt); void handleCommand_EyeOffset(NetworkPacket* pkt); void handleCommand_UpdatePlayerList(NetworkPacket* pkt); + void handleCommand_ModChannelMsg(NetworkPacket *pkt); + void handleCommand_ModChannelSignal(NetworkPacket *pkt); void handleCommand_SrpBytesSandB(NetworkPacket* pkt); void handleCommand_CSMFlavourLimits(NetworkPacket *pkt); @@ -370,7 +242,6 @@ public: void sendChangePassword(const std::string &oldpassword, const std::string &newpassword); void sendDamage(u8 damage); - void sendBreath(u16 breath); void sendRespawn(); void sendReady(); @@ -446,7 +317,7 @@ public: bool hasClientEvents() const { return !m_client_event_queue.empty(); } // Get event from queue. If queue is empty, it triggers an assertion failure. - ClientEvent getClientEvent(); + ClientEvent * getClientEvent(); bool accessDenied() const { return m_access_denied; } @@ -472,8 +343,10 @@ public: u8 getProtoVersion() { return m_proto_ver; } - bool connectedToServer() - { return m_con.Connected(); } + bool connectedToServer(); + void confirmRegistration(); + bool m_is_registration_confirmation_state = false; + bool m_simple_singleplayer_mode; float mediaReceiveProgress(); @@ -491,7 +364,7 @@ public: // IGameDef interface virtual IItemDefManager* getItemDefManager(); - virtual INodeDefManager* getNodeDefManager(); + virtual const NodeDefManager* getNodeDefManager(); virtual ICraftDefManager* getCraftDefManager(); ITextureSource* getTextureSource(); virtual IShaderSource* getShaderSource(); @@ -502,7 +375,7 @@ public: virtual ParticleManager* getParticleManager(); bool checkLocalPrivilege(const std::string &priv) { return checkPrivilege(priv); } - virtual scene::IAnimatedMesh* getMesh(const std::string &filename); + virtual scene::IAnimatedMesh* getMesh(const std::string &filename, bool cache = false); const std::string* getModFile(const std::string &filename); virtual std::string getModStoragePath() const; @@ -527,22 +400,11 @@ public: ClientScripting *getScript() { return m_script; } const bool moddingEnabled() const { return m_modding_enabled; } - inline void pushToEventQueue(const ClientEvent &event) - { - m_client_event_queue.push(event); - } + void pushToEventQueue(ClientEvent *event); - void showGameChat(bool show = true); - void showGameHud(bool show = true); void showMinimap(bool show = true); - void showProfiler(bool show = true); - void showGameFog(bool show = true); - void showGameDebug(bool show = true); - const Address getServerAddress() - { - return m_con.GetPeerAddress(PEER_ID_SERVER); - } + const Address getServerAddress(); const std::string &getAddressName() const { @@ -559,7 +421,19 @@ public: return m_csm_noderange_limit; } + inline std::unordered_map &getHUDTranslationMap() + { + return m_hud_server_to_client; + } + + bool joinModChannel(const std::string &channel); + bool leaveModChannel(const std::string &channel); + bool sendModChannelMessage(const std::string &channel, const std::string &message); + ModChannel *getModChannel(const std::string &channel); + private: + void loadMods(); + bool checkBuiltinIntegrity(); // Virtual methods from con::PeerHandler void peerAdded(con::Peer *peer); @@ -580,8 +454,8 @@ private: // helper method shared with clientpackethandler static AuthMechanism choseAuthMech(const u32 mechs); - void sendLegacyInit(const char* playerName, const char* playerPassword); void sendInit(const std::string &playerName); + void promptConfirmRegistration(AuthMechanism chosen_auth_mechanism); void startAuth(AuthMechanism chosen_auth_mechanism); void sendDeletedBlocks(std::vector &blocks); void sendGotBlocks(v3s16 block); @@ -597,13 +471,12 @@ private: float m_connection_reinit_timer = 0.1f; float m_avg_rtt_timer = 0.0f; float m_playerpos_send_timer = 0.0f; - float m_ignore_damage_timer = 0.0f; // Used after server moves player IntervalLimiter m_map_timer_and_unload_interval; IWritableTextureSource *m_tsrc; IWritableShaderSource *m_shsrc; IWritableItemDefManager *m_itemdef; - IWritableNodeDefManager *m_nodedef; + NodeDefManager *m_nodedef; ISoundManager *m_sound; MtEventManager *m_event; @@ -611,7 +484,7 @@ private: MeshUpdateThread m_mesh_update_thread; ClientEnvironment m_env; ParticleManager m_particle_manager; - con::Connection m_con; + std::unique_ptr m_con; std::string m_address_name; Camera *m_camera = nullptr; Minimap *m_minimap = nullptr; @@ -662,9 +535,10 @@ private: bool m_access_denied = false; bool m_access_denied_reconnect = false; std::string m_access_denied_reason = ""; - std::queue m_client_event_queue; + std::queue m_client_event_queue; bool m_itemdef_received = false; bool m_nodedef_received = false; + bool m_mods_loaded = false; ClientMediaDownloader *m_media_downloader; // time_of_day speed approximation for old protocol @@ -684,6 +558,12 @@ private: // And relations to objects std::unordered_map m_sounds_to_objects; + // CSM/client IDs to SSM/server IDs Mapping + // Map server particle spawner IDs to client IDs + std::unordered_map m_particles_server_to_client; + // Map server hud ids to client hud ids + std::unordered_map m_hud_server_to_client; + // Privileges std::unordered_set m_privileges; @@ -699,6 +579,8 @@ private: // own state LocalClientState m_state; + GameUI *m_game_ui; + // Used for saving server map to disk client-side MapDatabase *m_localdb = nullptr; IntervalLimiter m_localdb_save_interval; @@ -709,11 +591,12 @@ private: std::unordered_map m_mod_storages; float m_mod_storage_save_timer = 10.0f; std::vector m_mods; - GameUIFlags *m_game_ui_flags; bool m_shutdown = false; // CSM flavour limits byteflag u64 m_csm_flavour_limits = CSMFlavourLimit::CSM_FL_NONE; u32 m_csm_noderange_limit = 8; + + std::unique_ptr m_modchannel_mgr; };