From eb0f640fa01ff9be5516f5ae3da33b2e76756577 Mon Sep 17 00:00:00 2001 From: Mat Date: Fri, 17 Jul 2020 21:33:02 +0300 Subject: Initial work on 1.13 entity metadata (#4539) * Initial work on 1.13 entity metadata * Largely complete metadata Co-authored-by: Tiger Wang --- src/Protocol/Protocol_1_13.h | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) (limited to 'src/Protocol/Protocol_1_13.h') diff --git a/src/Protocol/Protocol_1_13.h b/src/Protocol/Protocol_1_13.h index 3d70f74d7..168c279c1 100644 --- a/src/Protocol/Protocol_1_13.h +++ b/src/Protocol/Protocol_1_13.h @@ -39,45 +39,51 @@ public: virtual void Initialize(cClientHandle & a_Client) override; - protected: - /** The palette used to transform internal block type palette into the protocol-specific ID. */ - std::shared_ptr m_BlockTypePalette; - - /** Temporary hack for initial 1.13+ support while keeping BLOCKTYPE data: - Map of the BLOCKTYPE#META to the protocol-specific NetBlockID. */ - std::map m_BlockTypeMap; - - /** Returns the string identifying the palettes' version, such as "1.13" or "1.14.4". The palettes for that version are loaded into m_BlockTypePalette and m_ItemTypePalette. */ virtual AString GetPaletteVersion() const; - // Outgoing packet type translation: - virtual UInt32 GetPacketID(ePacketType a_PacketType) override; - - // Packet receiving: - virtual bool HandlePacket(cByteBuffer & a_ByteBuffer, UInt32 a_PacketType) override; - virtual void HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) override; - virtual void HandlePacketPluginMessage(cByteBuffer & a_ByteBuffer) override; - // Packet sending: virtual void SendBlockChange (int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta) override; virtual void SendBlockChanges (int a_ChunkX, int a_ChunkZ, const sSetBlockVector & a_Changes) override; virtual void SendChunkData (int a_ChunkX, int a_ChunkZ, cChunkDataSerializer & a_Serializer) override; virtual void SendMapData (const cMap & a_Map, int a_DataStartX, int a_DataStartY) override; virtual void SendPaintingSpawn (const cPainting & a_Painting) override; + virtual void SendParticleEffect (const AString & a_ParticleName, Vector3f a_Src, Vector3f a_Offset, float a_ParticleData, int a_ParticleAmount, std::array a_Data) override; virtual void SendPluginMessage (const AString & a_Channel, const AString & a_Message) override; virtual void SendScoreboardObjective (const AString & a_Name, const AString & a_DisplayName, Byte a_Mode) override; virtual void SendStatistics (const cStatManager & a_Manager) override; virtual void SendTabCompletionResults (const AStringVector & a_Results) override; virtual void SendUpdateBlockEntity (cBlockEntity & a_BlockEntity) override; + // Packet receiving: + virtual bool HandlePacket(cByteBuffer & a_ByteBuffer, UInt32 a_PacketType) override; + virtual void HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer) override; + virtual void HandlePacketPluginMessage(cByteBuffer & a_ByteBuffer) override; + + // Outgoing packet type translation: + virtual UInt32 GetPacketID(ePacketType a_PacketType) override; + /** Converts eMonsterType to protocol-specific mob types */ virtual UInt32 GetProtocolMobType(eMonsterType a_MobType) override; + virtual UInt8 GetEntityMetadataID(eEntityMetadata a_Metadata); + virtual UInt8 GetEntityMetadataID(eEntityMetadataType a_FieldType); + virtual bool ReadItem(cByteBuffer & a_ByteBuffer, cItem & a_Item, size_t a_KeepRemainingBytes) override; virtual void WriteItem(cPacketizer & a_Pkt, const cItem & a_Item) override; + virtual void WriteEntityMetadata(cPacketizer & a_Pkt, const eEntityMetadata a_Metadata, const eEntityMetadataType a_FieldType); virtual void WriteEntityMetadata(cPacketizer & a_Pkt, const cEntity & a_Entity) override; + virtual void WriteMobMetadata(cPacketizer & a_Pkt, const cMonster & a_Mob) override; + +private: + + /** The palette used to transform internal block type palette into the protocol-specific ID. */ + std::shared_ptr m_BlockTypePalette; + + /** Temporary hack for initial 1.13+ support while keeping BLOCKTYPE data: + Map of the BLOCKTYPE#META to the protocol-specific NetBlockID. */ + std::map m_BlockTypeMap; }; -- cgit v1.2.3