[FurnaceWidget] Removed. Now completely implemented in Lua.

TODO

@@ -31,7 +31,7 @@ TODO
 
 • DONE: Implement `PlayerInventoryWidget` completely in Lua
 • DONE: Implement `PlayerCraftingWidget` completely in Lua
-• WIP: Implement `FurnaceWidget` completely in Lua
+• DONE: Implement `FurnaceWidget` completely in Lua
    ◦ DONE: Add a `ProgressBarWidget`
 
 # Menus

client/include/gui/InventoryWidget.hpp

@@ -38,6 +38,8 @@ class InventoryWidget : public Widget {
 
 		void onMouseEvent(const SDL_Event &event, MouseItemWidget &mouseItemWidget, bool isReadOnly = false);
 
+		void update() override;
+
 		const ItemWidget *currentItemWidget() const { return m_currentItemWidget; }
 
 	private:

client/include/gui/ProgressBarWidget.hpp

@@ -28,17 +28,17 @@
 #include "BlockData.hpp"
 #include "Widget.hpp"
 
-enum class ProgressBarType {
-	ItemProcess,
-	BurnProcess
+enum class ProgressBarType : u8 {
+	ItemProcess = 0,
+	BurnProcess = 1
 };
 
 class ProgressBarWidget : public Widget {
 	public:
 		ProgressBarWidget(const std::string &texture, BlockData &blockData, ProgressBarType type, Widget *parent = nullptr);
 
-		void init(const gk::IntRect &clipRect, const gk::Vector2i &position, const std::string &meta, unsigned int maxMetaValue);
-		void init(const gk::IntRect &clipRect, const gk::Vector2i &position, const std::string &meta, const std::string &maxMeta);
+		void init(const gk::FloatRect &clipRect, const gk::Vector2i &position, const std::string &meta, unsigned int maxMetaValue);
+		void init(const gk::FloatRect &clipRect, const gk::Vector2i &position, const std::string &meta, const std::string &maxMeta);
 
 		void update() override;
 
@@ -47,7 +47,7 @@ class ProgressBarWidget : public Widget {
 
 		BlockData &m_blockData;
 
-		gk::IntRect m_clipRect;
+		gk::FloatRect m_clipRect;
 		gk::Vector2i m_position;
 
 		std::string m_meta;

client/source/gui/InventoryWidget.cpp

@@ -68,6 +68,11 @@ void InventoryWidget::onMouseEvent(const SDL_Event &event, MouseItemWidget &mous
 	}
 }
 
+void InventoryWidget::update() {
+	for (auto &it : m_itemWidgets)
+		it.update();
+}
+
 void InventoryWidget::sendUpdatePacket() {
 	if (m_inventory->inBlock()) {
 		m_client.sendBlockInvUpdate(*m_inventory);

client/source/gui/ProgressBarWidget.cpp

@@ -28,7 +28,7 @@ ProgressBarWidget::ProgressBarWidget(const std::string &texture, BlockData &bloc
 	m_type = type;
 }
 
-void ProgressBarWidget::init(const gk::IntRect &clipRect, const gk::Vector2i &position, const std::string &meta, unsigned int maxMetaValue) {
+void ProgressBarWidget::init(const gk::FloatRect &clipRect, const gk::Vector2i &position, const std::string &meta, unsigned int maxMetaValue) {
 	m_clipRect = clipRect;
 	m_position = position;
 
@@ -39,7 +39,7 @@ void ProgressBarWidget::init(const gk::IntRect &clipRect, const gk::Vector2i &po
 	m_maxMetaValue = maxMetaValue;
 }
 
-void ProgressBarWidget::init(const gk::IntRect &clipRect, const gk::Vector2i &position, const std::string &meta, const std::string &maxMeta) {
+void ProgressBarWidget::init(const gk::FloatRect &clipRect, const gk::Vector2i &position, const std::string &meta, const std::string &maxMeta) {
 	m_clipRect = clipRect;
 	m_position = position;
 

client/source/states/LuaGUIState.cpp

@@ -30,12 +30,12 @@
 #include "ClientPlayer.hpp"
 #include "ClientWorld.hpp"
 #include "Config.hpp"
-#include "FurnaceWidget.hpp"
 #include "InventoryWidget.hpp"
 #include "LuaGUIState.hpp"
 #include "LuaWidget.hpp"
 #include "Network.hpp"
 #include "Player.hpp"
+#include "ProgressBarWidget.hpp"
 #include "TextButton.hpp"
 
 LuaGUIState::LuaGUIState(ClientCommandHandler &client, ClientPlayer &player, ClientWorld &world, sf::Packet &packet, gk::ApplicationState *parent)
@@ -85,6 +85,10 @@ void LuaGUIState::update() {
 		it.update();
 	}
 
+	for (auto &it : m_inventoryWidgets) {
+		it.update();
+	}
+
 	const ItemWidget *currentItemWidget = nullptr;
 	for (auto &it : m_inventoryWidgets) {
 		if (!currentItemWidget)
@@ -149,18 +153,64 @@ void LuaGUIState::loadGUI(ClientPlayer &player, ClientWorld &world, sf::Packet &
 		m_widgets.emplace_back(button);
 	}
 	else if (type == LuaWidget::InventoryWidget) {
-		std::string playerName, inventory;
+		std::string inventory, playerName, inventory_name;
+		gk::Vector3i block;
 		float width, height;
 		u16 offset, count;
-		packet >> playerName >> inventory >> width >> height >> offset >> count;
+		packet >> inventory >> playerName >> inventory_name
+			>> block.x >> block.y >> block.z
+			>> width >> height >> offset >> count;
+
+		Inventory *widgetInventory = nullptr;
+		if (inventory == "player") {
+			widgetInventory = &player.inventory();
+		}
+		else if (inventory == "block") {
+			BlockData *data = world.getBlockData(block.x, block.y, block.z);
+			if (!data) {
+				DEBUG("ERROR: No inventory found at", block.x, block.y, block.z);
+				return;
+			}
+
+			widgetInventory = &data->inventory;
+		}
+
+		if (widgetInventory) {
+			m_inventoryWidgets.emplace_back(m_client, &m_mainWidget);
+
+			auto &inventoryWidget = m_inventoryWidgets.back();
+			inventoryWidget.setPosition(x, y);
+			inventoryWidget.init(*widgetInventory, offset, count);
+		}
+		else {
+			DEBUG("ERROR: Widget inventory is invalid");
+		}
+	}
+	else if (type == LuaWidget::ProgressBarWidget) {
+		u8 type;
+		gk::Vector3i block;
+		std::string meta, maxMeta;
+		u32 maxValue;
+		std::string texture;
+		gk::FloatRect clipRect;
+		packet >> type >> block.x >> block.y >> block.z >> meta >> maxMeta >> maxValue >> texture
+			>> clipRect.x >> clipRect.y >> clipRect.sizeX >> clipRect.sizeY;
 
-		m_inventoryWidgets.emplace_back(m_client, &m_mainWidget);
+		BlockData *data = world.getBlockData(block.x, block.y, block.z);
+		if (!data) {
+			DEBUG("ERROR: No inventory found at", block.x, block.y, block.z);
+			return;
+		}
 
-		auto &inventoryWidget = m_inventoryWidgets.back();
-		inventoryWidget.setPosition(x, y);
-		inventoryWidget.init(player.inventory(), offset, count);
+		ProgressBarWidget *widget = new ProgressBarWidget(texture, *data, ProgressBarType(type));
+		if (!maxMeta.empty())
+			widget->init(clipRect, gk::Vector2i{x, y}, meta, maxMeta);
+		else
+			widget->init(clipRect, gk::Vector2i{x, y}, meta, maxValue);
+
+		m_widgets.emplace_back(widget);
 	}
-	else if (type == LuaWidget::CraftingWidget) {
+	else if (type == LuaWidget::CraftingWidget) { // FIXME
 		std::string inventory;
 		gk::Vector3i block;
 		u16 offset, size;
@@ -194,18 +244,5 @@ void LuaGUIState::loadGUI(ClientPlayer &player, ClientWorld &world, sf::Packet &
 			DEBUG("ERROR: Crafting inventory is invalid");
 		}
 	}
-	else if (type == LuaWidget::FurnaceWidget) {
-		gk::Vector3i block;
-		packet >> block.x >> block.y >> block.z;
-		BlockData *data = world.getBlockData(block.x, block.y, block.z);
-		if (data) {
-			auto *furnaceWidget = new FurnaceWidget(m_client, m_mouseItemWidget, player.inventory(), *data, &m_mainWidget);
-			furnaceWidget->setPosition(x, y);
-			m_widgets.emplace_back(furnaceWidget);
-		}
-		else {
-			DEBUG("ERROR: No inventory found at", block.x, block.y, block.z);
-		}
-	}
 }
 

common/include/core/LuaWidget.hpp

@@ -27,11 +27,11 @@
 
 namespace LuaWidget {
 	enum : u8 {
-		Image           = 0,
-		TextButton      = 1,
-		InventoryWidget = 2,
-		CraftingWidget  = 3,
-		FurnaceWidget   = 4,
+		Image             = 0,
+		TextButton        = 1,
+		InventoryWidget   = 2,
+		CraftingWidget    = 3,
+		ProgressBarWidget = 4,
 	};
 }