Client: Restore temporary hack to be able to mine forcefields

Author: SirLynix

include/ClientLib/ClientBlockLibrary.hpp

@@ -34,6 +34,8 @@ namespace tsom
 			inline const std::shared_ptr<Nz::GpuBuffer>& GetGlobalBlockBuffer() const;
 			inline const std::shared_ptr<Nz::TextureAsset>& GetPreviewTexture(BlockIndex blockIndex) const;
 
+			bool LoadFromString(std::string_view content, bool merge = false) override;
+
 		private:
 			std::shared_ptr<Nz::GpuBuffer> m_globalBlockBuffer;
 			std::vector<std::shared_ptr<Nz::TextureAsset>> m_previewTextures;

include/ClientLib/ClientBlockLibrary.inl

@@ -8,10 +8,6 @@ namespace tsom
 	m_applicationBase(applicationBase),
 	m_globalBlockBufferPtr(nullptr)
 	{
-		// HAAAAAAAAAAAAAAAAAAAAX
-		// Re-enable collisions for forcefield to allow clients to remove them (player collisions are only handled on the server for now)
-		if (BlockIndex idx = GetBlockIndex("forcefield"); idx != InvalidBlockIndex)
-			m_blocks[idx].hasCollisions = true;
 	}
 
 	inline const std::shared_ptr<Nz::TextureAsset>& ClientBlockLibrary::GetBlockTexture(CookedBlockRegistry::TextureType textureType) const

include/CommonLib/BlockLibrary.hpp

@@ -40,7 +40,7 @@ namespace tsom
 			inline bool IsValidBlock(BlockIndex blockIndex) const;
 			inline bool IsValidLayer(std::size_t layerIndex) const;
 
-			bool LoadFromString(std::string_view content, bool merge = false);
+			virtual bool LoadFromString(std::string_view content, bool merge = false);
 
 			BlockIndex RegisterBlock(std::string name, BlockInfo blockInfo);
 			std::size_t RegisterLayer(std::string name, LayerInfo layerInfo);

src/ClientLib/ClientBlockLibrary.cpp

@@ -240,4 +240,19 @@ namespace tsom
 			m_previewTextures[blockIndex] = Nz::TextureAsset::CreateView(m_blockTextures[previewTextures[blockIndex].first], slotTexView);
 		}
 	}
+
+	bool ClientBlockLibrary::LoadFromString(std::string_view content, bool merge)
+	{
+		if (!BlockLibrary::LoadFromString(content, merge))
+			return false;
+
+		// Re-enable collisions on the client to allow clients to remove them (player collisions are only handled on the server for now)
+		// FIXME: Handle this with collisions layers
+		for (BlockData& blockData : m_blocks)
+			blockData.hasCollisions = true;
+
+		m_blocks[EmptyBlockIndex].hasCollisions = false; //< Except for the empty block
+
+		return true;
+	}
 }