[BlockMetadata] Added. Now used in FurnaceWidget and furnace.lua

README.md

@@ -73,12 +73,12 @@ This list is non exhaustive.
 	- Block/item/recipe definition
 	- Custom GUI creation
 - Special blocks (workbench, furnace)
+- Block metadata
 
 ### Missing features
 
 - Texture pack system
 - World loading/saving
-- Advanced block metadata
 - Particle system
 - Fluid propagation
 - Player model display (currently displaying an ugly box)

TODO

@@ -82,7 +82,7 @@ TODO
 
 # World
 
-• TODO: Block metadata
+• DONE: Block metadata
 • TODO: Day/night cycle
 
 # Chunk generation

client/source/gui/FurnaceWidget.cpp

@@ -48,9 +48,9 @@ void FurnaceWidget::onEvent(const SDL_Event &event) {
 }
 
 void FurnaceWidget::update() {
-	u16 ticksRemaining = m_blockData.data & 0xfff;
-	u16 currentBurnTime = (m_blockData.data >> 12) & 0xfff;
-	u16 itemProgress = (m_blockData.data >> 24) & 0xff;
+	u16 ticksRemaining = m_blockData.meta.get<int>("ticks_remaining");
+	u16 currentBurnTime = m_blockData.meta.get<int>("current_burn_time");
+	u16 itemProgress = m_blockData.meta.get<int>("item_progress");
 
 	if (currentBurnTime) {
 		m_burnImage.setPosition(57, 37 + 14 - ticksRemaining * 14 / currentBurnTime, 0);

client/source/network/ClientCommandHandler.cpp

@@ -170,7 +170,7 @@ void ClientCommandHandler::setupCallbacks() {
 
 			if (data) {
 				bool useAltTiles;
-				packet >> data->data >> useAltTiles;
+				packet >> data->meta >> useAltTiles;
 
 				if (data->useAltTiles != useAltTiles) {
 					chunk->setChanged(true);

common/include/world/BlockData.hpp

@@ -14,6 +14,7 @@
 #ifndef BLOCKDATA_HPP_
 #define BLOCKDATA_HPP_
 
+#include "BlockMetadata.hpp"
 #include "Inventory.hpp"
 
 struct BlockData {
@@ -24,7 +25,7 @@ struct BlockData {
 
 	Inventory inventory;
 
-	u32 data = 0;
+	BlockMetadata meta;
 
 	bool useAltTiles = false;
 };

common/include/world/BlockMetadata.hpp

@@ -0,0 +1,86 @@
+/*
+ * =====================================================================================
+ *
+ *       Filename:  BlockMetadata.hpp
+ *
+ *    Description:
+ *
+ *        Created:  08/02/2020 16:02:50
+ *
+ *         Author:  Quentin Bazin, <[email protected]>
+ *
+ * =====================================================================================
+ */
+#ifndef BLOCKMETADATA_HPP_
+#define BLOCKMETADATA_HPP_
+
+#include <memory>
+#include <string>
+#include <unordered_map>
+
+#include <sol.hpp>
+
+#include <gk/core/IntTypes.hpp>
+#include <gk/core/Exception.hpp>
+
+#include "ISerializable.hpp"
+
+class BlockMetadataValue {
+	public:
+		enum class Type : u8 {
+			Undefined,
+			String,
+			Int
+		};
+
+		template<typename T>
+		T &get() const {
+			return *std::static_pointer_cast<T>(m_value);
+		}
+
+		template<typename T>
+		void set(const T &value, Type type) {
+			m_value = std::make_shared<T>(value);
+			m_type = type;
+		}
+
+		Type type() const { return m_type; }
+
+	private:
+		std::shared_ptr<void> m_value;
+		Type m_type = Type::Undefined;
+};
+
+class BlockMetadata : public ISerializable {
+	public:
+		void setString(const std::string &name, const std::string &value);
+		void setInt(const std::string &name, int value);
+
+		template<typename T>
+		T &get(const std::string &name) {
+			auto it = m_data.find(name);
+			if (it == m_data.end())
+				throw EXCEPTION("Unable to find metadata named", name);
+
+			return it->second.get<T>();
+		}
+
+		template<typename T>
+		sol::object getLuaObject(const std::string &name, sol::this_state state) {
+			sol::state_view lua{state};
+
+			auto it = m_data.find(name);
+			if (it == m_data.end())
+				return sol::make_object(lua, sol::lua_nil);
+
+			return sol::make_object<T>(lua, it->second.get<T>());
+		}
+
+		void serialize(sf::Packet &packet) const override;
+		void deserialize(sf::Packet &packet) override;
+
+	private:
+		std::unordered_map<std::string, BlockMetadataValue> m_data;
+};
+
+#endif // BLOCKMETADATA_HPP_

common/source/world/BlockMetadata.cpp

@@ -0,0 +1,60 @@
+/*
+ * =====================================================================================
+ *
+ *       Filename:  BlockMetadata.cpp
+ *
+ *    Description:
+ *
+ *        Created:  08/02/2020 16:03:18
+ *
+ *         Author:  Quentin Bazin, <[email protected]>
+ *
+ * =====================================================================================
+ */
+#include <SFML/Network/Packet.hpp>
+
+#include "BlockMetadata.hpp"
+
+void BlockMetadata::setString(const std::string &name, const std::string &value) {
+	m_data[name].set(value, BlockMetadataValue::Type::String);
+}
+
+void BlockMetadata::setInt(const std::string &name, int value) {
+	m_data[name].set(value, BlockMetadataValue::Type::Int);
+}
+
+void BlockMetadata::serialize(sf::Packet &packet) const {
+	packet << u32(m_data.size());
+	for (auto &it : m_data) {
+		packet << u8(it.second.type()) << it.first;
+		if (it.second.type() == BlockMetadataValue::Type::String) {
+			packet << it.second.get<std::string>();
+		}
+		else if (it.second.type() == BlockMetadataValue::Type::Int) {
+			packet << it.second.get<int>();
+		}
+	}
+}
+
+void BlockMetadata::deserialize(sf::Packet &packet) {
+	u32 size;
+	packet >> size;
+	for (u32 i = 0 ; i < size ; ++i) {
+		u8 typeU8;
+		std::string name;
+		packet >> typeU8 >> name;
+
+		BlockMetadataValue::Type type = BlockMetadataValue::Type(typeU8);
+		if (type == BlockMetadataValue::Type::String) {
+			std::string value;
+			packet >> value;
+			m_data[name].set(value, type);
+		}
+		else if (type == BlockMetadataValue::Type::Int) {
+			int value;
+			packet >> value;
+			m_data[name].set(value, type);
+		}
+	}
+}
+