[LuaMod] Small refactoring.

Unarelith · May 17, 2020 · 61c6769 · 61c6769
1 parent 1f8078f
commit 61c6769
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 57 deletions.
diff --git a/source/server/lua/LuaMod.cpp b/source/server/lua/LuaMod.cpp
@@ -51,61 +51,29 @@ void LuaMod::commit() {
 	}
 }
 
+#define DEF_FUNC(type) [](LuaMod &self, const sol::table &table) { \
+	self.m_defs.emplace(type, table); \
+}
+
 void LuaMod::initUsertype(sol::state &lua) {
 	lua.new_usertype<LuaMod>("LuaMod",
 		"id",              &LuaMod::id,
 		"path",            &LuaMod::path,
 
-		"block",           &LuaMod::registerBlock,
-		"item",            &LuaMod::registerItem,
-		"crafting_recipe", &LuaMod::registerCraftingRecipe,
-		"smelting_recipe", &LuaMod::registerSmeltingRecipe,
-		"sky",             &LuaMod::registerSky,
-		"tree",            &LuaMod::registerTree,
-		"biome",           &LuaMod::registerBiome,
-		"dimension",       &LuaMod::registerDimension,
-		"entity",          &LuaMod::registerEntity,
-
-		"spawn_entity",    &LuaMod::spawnEntity
+		"spawn_entity",    &LuaMod::spawnEntity,
+
+		"block",           DEF_FUNC(DefinitionType::Block),
+		"item",            DEF_FUNC(DefinitionType::Item),
+		"crafting_recipe", DEF_FUNC(DefinitionType::CraftingRecipe),
+		"smelting_recipe", DEF_FUNC(DefinitionType::SmeltingRecipe),
+		"sky",             DEF_FUNC(DefinitionType::Sky),
+		"tree",            DEF_FUNC(DefinitionType::Tree),
+		"biome",           DEF_FUNC(DefinitionType::Biome),
+		"dimension",       DEF_FUNC(DefinitionType::Dimension),
+		"entity",          DEF_FUNC(DefinitionType::Entity)
 	);
 }
 
-void LuaMod::registerBlock(const sol::table &table) {
-	m_defs.emplace(DefinitionType::Block, table);
-}
-
-void LuaMod::registerItem(const sol::table &table) {
-	m_defs.emplace(DefinitionType::Item, table);
-}
-
-void LuaMod::registerCraftingRecipe(const sol::table &table) {
-	m_defs.emplace(DefinitionType::CraftingRecipe, table);
-}
-
-void LuaMod::registerSmeltingRecipe(const sol::table &table) {
-	m_defs.emplace(DefinitionType::SmeltingRecipe, table);
-}
-
-void LuaMod::registerSky(const sol::table &table) {
-	m_defs.emplace(DefinitionType::Sky, table);
-}
-
-void LuaMod::registerTree(const sol::table &table) {
-	m_defs.emplace(DefinitionType::Tree, table);
-}
-
-void LuaMod::registerBiome(const sol::table &table) {
-	m_defs.emplace(DefinitionType::Biome, table);
-}
-
-void LuaMod::registerDimension(const sol::table &table) {
-	m_defs.emplace(DefinitionType::Dimension, table);
-}
-
-void LuaMod::registerEntity(const sol::table &table) {
-	m_defs.emplace(DefinitionType::Entity, table);
-}
-
 void LuaMod::spawnEntity(const std::string &entityID, const sol::table &table) {
 	m_entityLoader.spawnEntity(entityID, table);
 }

diff --git a/source/server/lua/LuaMod.hpp b/source/server/lua/LuaMod.hpp
@@ -55,16 +55,6 @@ class LuaMod {
 		static void initUsertype(sol::state &lua);
 
 	private:
-		void registerBlock(const sol::table &table);
-		void registerItem(const sol::table &table);
-		void registerCraftingRecipe(const sol::table &table);
-		void registerSmeltingRecipe(const sol::table &table);
-		void registerSky(const sol::table &table);
-		void registerTree(const sol::table &table);
-		void registerBiome(const sol::table &table);
-		void registerDimension(const sol::table &table);
-		void registerEntity(const sol::table &table);
-
 		void spawnEntity(const std::string &entityID, const sol::table &table);
 
 		enum class DefinitionType {