migrate depends and desc to mod.conf, minetest -> core (#6)

* migrate depends and desc to mod.conf

* Delete description.txt

* Delete depends.txt

* csv

* use core (init.lua)

* use core (awards.lua)

* use core (copy_tool.lua)

* use core (disable_global.lua)

* use core (display_item.lua)

* use core (display_node.lua)

* use core (formspecs.lua)

* use core (functions.lua)

* use core (integrations.lua)

* use core (inventory_helpers.lua)

* use core (node_helpers.lua)

* use core (privileges.lua)

* use core (purchase.lua)

* use core (receive_fields.lua)

* use core (upgrade.lua)

* use core (utils.lua)

* use core (vendor_node.lua)

* delegate awards check to init.lua

* delegate awards check to init.lua

* use core (.luacheckrc)

* global exists for global reading

Author: The4codeblocks

.luacheckrc

@@ -1,7 +1,7 @@
 
 globals = {
 	"fancy_vend",
-	"minetest",
+	"core",
 	"mail"
 }
 

awards.lua

@@ -1,55 +1,52 @@
 
--- Awards
-if minetest.get_modpath("awards") then
-	awards.register_award("fancy_vend:getting_fancy", {
-		title = "Getting Fancy",
-		description = "Craft a fancy vendor.",
-		trigger = {
-			type = "craft",
-			item = fancy_vend.rop_vendor,
-			target = 1,
-		},
-		icon = "player_vend_front.png^awards_level1.png",
-	})
-	awards.register_award("fancy_vend:wizard", {
-		title = "You're a Wizard",
-		description = "Craft a copy tool.",
-		trigger = {
-			type = "craft",
-			item = "fancy_vend:copy_tool",
-			target = 1,
-		},
-		icon = "copier.png",
-	})
-	awards.register_award("fancy_vend:trader", {
-		title = "Trader",
-		description = "Configure a depositor.",
-		icon = "player_depo_front.png",
-	})
-	awards.register_award("fancy_vend:seller", {
-		title = "Seller",
-		description = "Configure a vendor.",
-		icon = "player_vend_front.png^awards_level2.png",
-	})
-	awards.register_award("fancy_vend:shop_keeper", {
-		title = "Shop Keeper",
-		description = "Configure 10 vendors or depositors.",
-		icon = "player_vend_front.png^awards_level3.png",
-	})
-	awards.register_award("fancy_vend:merchant", {
-		title = "Merchant",
-		description = "Configure 25 vendors or depositors.",
-		icon = "player_vend_front.png^awards_level4.png",
-	})
-	awards.register_award("fancy_vend:super_merchant", {
-		title = "Super Merchant",
-		description = "Configure 100 vendors or depositors. How do you even have this much stuff to sell?",
-		icon = "player_vend_front.png^awards_level5.png",
-	})
-	awards.register_award("fancy_vend:god_merchant", {
-		title = "God Merchant",
-		description = "Configure 9001 vendors or depositors. Ok wot.",
-		icon = "player_vend_front.png^awards_level6.png",
-		secret = true, -- Oi. Cheater.
-	})
-end
+awards.register_award("fancy_vend:getting_fancy", {
+	title = "Getting Fancy",
+	description = "Craft a fancy vendor.",
+	trigger = {
+		type = "craft",
+		item = fancy_vend.rop_vendor,
+		target = 1,
+	},
+	icon = "player_vend_front.png^awards_level1.png",
+})
+awards.register_award("fancy_vend:wizard", {
+	title = "You're a Wizard",
+	description = "Craft a copy tool.",
+	trigger = {
+		type = "craft",
+		item = "fancy_vend:copy_tool",
+		target = 1,
+	},
+	icon = "copier.png",
+})
+awards.register_award("fancy_vend:trader", {
+	title = "Trader",
+	description = "Configure a depositor.",
+	icon = "player_depo_front.png",
+})
+awards.register_award("fancy_vend:seller", {
+	title = "Seller",
+	description = "Configure a vendor.",
+	icon = "player_vend_front.png^awards_level2.png",
+})
+awards.register_award("fancy_vend:shop_keeper", {
+	title = "Shop Keeper",
+	description = "Configure 10 vendors or depositors.",
+	icon = "player_vend_front.png^awards_level3.png",
+})
+awards.register_award("fancy_vend:merchant", {
+	title = "Merchant",
+	description = "Configure 25 vendors or depositors.",
+	icon = "player_vend_front.png^awards_level4.png",
+})
+awards.register_award("fancy_vend:super_merchant", {
+	title = "Super Merchant",
+	description = "Configure 100 vendors or depositors. How do you even have this much stuff to sell?",
+	icon = "player_vend_front.png^awards_level5.png",
+})
+awards.register_award("fancy_vend:god_merchant", {
+	title = "God Merchant",
+	description = "Configure 9001 vendors or depositors. Ok wot.",
+	icon = "player_vend_front.png^awards_level6.png",
+	secret = true, -- Oi. Cheater.
+})

copy_tool.lua

@@ -5,18 +5,18 @@
 
 local function get_vendor_pos_and_settings(pointed_thing)
 	if pointed_thing.type ~= "node" then return false end
-	local pos = minetest.get_pointed_thing_position(pointed_thing, false)
-	local node = minetest.get_node(pos)
+	local pos = core.get_pointed_thing_position(pointed_thing, false)
+	local node = core.get_node(pos)
 	if node.name == "fancy_vend:display_node" then
 		pos.y = pos.y - 1
-		node = minetest.get_node(pos)
+		node = core.get_node(pos)
 	end
 	if not fancy_vend.is_vendor(node.name) then return false end
 	local settings = fancy_vend.get_vendor_settings(pos)
 	return pos, settings
 end
 
-minetest.register_tool("fancy_vend:copy_tool", {
+core.register_tool("fancy_vend:copy_tool", {
 	inventory_image = "copier.png",
 	description = "Geminio Wand (For copying vendor settings, right click to"..
 		"copy settings, left click to paste settings.)",
@@ -26,9 +26,9 @@ minetest.register_tool("fancy_vend:copy_tool", {
 		if not pos then return end
 
 		local meta = itemstack:get_meta()
-		meta:set_string("settings", minetest.serialize(settings))
+		meta:set_string("settings", core.serialize(settings))
 
-		minetest.chat_send_player(placer:get_player_name(), "Settings saved.")
+		core.chat_send_player(placer:get_player_name(), "Settings saved.")
 
 		return itemstack
 	end,
@@ -37,10 +37,10 @@ minetest.register_tool("fancy_vend:copy_tool", {
 		if not pos then return end
 
 		local meta = itemstack:get_meta()
-		local node_meta = minetest.get_meta(pos)
-		local new_settings = minetest.deserialize(meta:get_string("settings"))
+		local node_meta = core.get_meta(pos)
+		local new_settings = core.deserialize(meta:get_string("settings"))
 		if not new_settings then
-			minetest.chat_send_player(user:get_player_name(),
+			core.chat_send_player(user:get_player_name(),
 				"No settings to set with. Right-click first on the vendor you want to copy settings from."
 			)
 			return
@@ -54,21 +54,21 @@ minetest.register_tool("fancy_vend:copy_tool", {
 			new_settings.output_item_qty = current_settings.output_item_qty
 
 			-- Admin vendor priv check
-			if not minetest.check_player_privs(node_meta:get_string("owner"), {admin_vendor = true}) and
+			if not core.check_player_privs(node_meta:get_string("owner"), {admin_vendor = true}) and
 				new_settings.admin_vendor then
 				new_settings.admin_vendor = current_settings.admin_vendor
 			end
 
 			fancy_vend.set_vendor_settings(pos, new_settings)
 			fancy_vend.refresh_vendor(pos)
-			minetest.chat_send_player(user:get_player_name(), "Settings set at "..minetest.pos_to_string(pos)..".")
+			core.chat_send_player(user:get_player_name(), "Settings set at "..core.pos_to_string(pos)..".")
 		else
-			minetest.chat_send_player(user:get_player_name(), "You cannot modify this vendor.")
+			core.chat_send_player(user:get_player_name(), "You cannot modify this vendor.")
 		end
 	end,
 })
 
-minetest.register_craft({
+core.register_craft({
 	output = "fancy_vend:copy_tool",
 	recipe = {
 		{"default:stick","",                      ""               },
@@ -77,7 +77,7 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
+core.register_craft({
 	output = "fancy_vend:copy_tool",
 	recipe = {
 		{"",               "",                      "default:stick"},

depends.txt

@@ -1,20 +1,20 @@
 
 -- Craftitem to display when vendor is inactive (Use just image for this???)
-minetest.register_craftitem("fancy_vend:inactive", {
+core.register_craftitem("fancy_vend:inactive", {
 	description = "Fancy Vendor Inactive Item (you hacker you!)",
 	inventory_image = "inactive.png",
 	groups = {not_in_creative_inventory = 1},
 })
 
-local modstorage = minetest.get_mod_storage()
+local modstorage = core.get_mod_storage()
 
 if modstorage:get_string("all_inactive_force") == "" then
 	modstorage:set_string("all_inactive_force", "false")
 end
 
 fancy_vend.all_inactive_force = fancy_vend.stb(modstorage:get_string("all_inactive_force"))
 
-minetest.register_chatcommand("disable_all_vendors", {
+core.register_chatcommand("disable_all_vendors", {
 	description = "Toggle vendor inactivity.",
 	privs = {disable_vendor = true},
 	func = function()

description.txt

@@ -1,7 +1,7 @@
 
 local tmp = {}
 
-minetest.register_entity("fancy_vend:display_item", {
+core.register_entity("fancy_vend:display_item", {
 	hp_max = 1,
 	visual = "wielditem",
 	visual_size = {x = 0.33, y = 0.33},
@@ -37,7 +37,7 @@ minetest.register_entity("fancy_vend:display_item", {
 })
 
 function fancy_vend.remove_item(pos)
-	local objs = minetest.get_objects_inside_radius(pos, .5)
+	local objs = core.get_objects_inside_radius(pos, .5)
 	if objs then
 		for _, obj in ipairs(objs) do
 			if obj and obj:get_luaentity() and obj:get_luaentity().name == "fancy_vend:display_item" then
@@ -50,22 +50,22 @@ end
 function fancy_vend.update_item(pos, node)
 	pos.y = pos.y + 1
 	fancy_vend.remove_item(pos)
-	if minetest.get_node(pos).name ~= "fancy_vend:display_node" then
-		minetest.log("warning",
+	if core.get_node(pos).name ~= "fancy_vend:display_node" then
+		core.log("warning",
 			"[fancy_vend]: Placing display item inside "..
-			minetest.get_node(pos).name.." at "..minetest.pos_to_string(pos)..
+			core.get_node(pos).name.." at "..core.pos_to_string(pos)..
 			" is not permitted, aborting"
 		)
 		pos.y = pos.y - 1
 		return
 	end
 	pos.y = pos.y - 1
-	local meta = minetest.get_meta(pos)
+	local meta = core.get_meta(pos)
 	if meta:get_string("item") ~= "" then
 		pos.y = pos.y + (12 / 16 + 0.11)
 		tmp.nodename = node.name
 		tmp.texture = ItemStack(meta:get_string("item")):get_name()
-		minetest.add_entity(pos, "fancy_vend:display_item")
+		core.add_entity(pos, "fancy_vend:display_item")
 		pos.y = pos.y - (12 / 16 + 0.11)
 	end
 end

disable_global.lua

@@ -1,7 +1,7 @@
 
 -- Register a copy of the display node with no drops to make players separating
 -- the obsidian glass with something like a piston a non-issue.
-local display_node_def = table.copy(minetest.registered_nodes[fancy_vend.display_node])
+local display_node_def = table.copy(core.registered_nodes[fancy_vend.display_node])
 
 display_node_def.drop = ""
 display_node_def.pointable = false
@@ -16,11 +16,11 @@ if pipeworks then
 	}
 end
 
-minetest.register_node("fancy_vend:display_node", display_node_def)
+core.register_node("fancy_vend:display_node", display_node_def)
 
 
 -- LBM to refresh entities after clearobjects
-minetest.register_lbm({
+core.register_lbm({
 	label = "Refresh vendor display",
 	name = "fancy_vend:display_refresh",
 	nodenames = {"fancy_vend:display_node"},

display_item.lua

@@ -13,7 +13,7 @@ function fancy_vend.get_vendor_buyer_fs(pos, _, lots)
 
 	-- Add dynamic elements
 	local settings = fancy_vend.get_vendor_settings(pos)
-	local meta = minetest.get_meta(pos)
+	local meta = core.get_meta(pos)
 	local status, errorcode = fancy_vend.get_vendor_status(pos)
 
 	local input_desc = fancy_vend.get_item_description(settings.input_item)
@@ -96,19 +96,19 @@ function fancy_vend.get_vendor_settings_fs(pos)
 		"checkbox[5,2.6;auto_sort;Automatically sort inventory.;"..fancy_vend.bts(settings.auto_sort).."]"
 
 	-- Admin vendor checkbox only if owner is admin
-	local meta = minetest.get_meta(pos)
-	if minetest.check_player_privs(meta:get_string("owner"), {admin_vendor = true}) or settings.admin_vendor then
+	local meta = core.get_meta(pos)
+	if core.check_player_privs(meta:get_string("owner"), {admin_vendor = true}) or settings.admin_vendor then
 		checkboxes = checkboxes..
 			"checkbox[5,2.2;admin_vendor;Set vendor to an admin vendor.;"..
 			fancy_vend.bts(settings.admin_vendor).."]"
 	end
 
 
 	-- Optional dependancy specific elements
-	if minetest.get_modpath("pipeworks") or minetest.get_modpath("hopper") then
+	if core.get_modpath("pipeworks") or core.get_modpath("hopper") then
 		checkboxes = checkboxes..
 			"checkbox[1,1.7;currency_eject;Eject incoming currency.;"..fancy_vend.bts(settings.currency_eject).."]"
-		if minetest.get_modpath("pipeworks") then
+		if core.get_modpath("pipeworks") then
 			checkboxes = checkboxes..
 				"checkbox[5,1.3;accept_output_only;Accept for-sale item only.;"..
 				fancy_vend.bts(settings.accept_output_only).."]"..
@@ -117,7 +117,7 @@ function fancy_vend.get_vendor_settings_fs(pos)
 		end
 	end
 
-	if minetest.get_modpath("digilines") then
+	if core.get_modpath("digilines") then
 		fields = fields..
 			"field[6.41,4.1;2.66,1;digiline_channel;Digiline Channel:;"..settings.digiline_channel.."]"..
 			"field_close_on_enter[digiline_channel;false]"
@@ -172,8 +172,8 @@ function fancy_vend.get_vendor_log_fs(pos)
 		"button_exit[0,8;1,1;btn_exit;Done]"
 
 	-- Add dynamic elements
-	local meta = minetest.get_meta(pos)
-	local logs = minetest.deserialize(meta:get_string("log"))
+	local meta = core.get_meta(pos)
+	local logs = core.deserialize(meta:get_string("log"))
 
 	local settings = fancy_vend.get_vendor_settings(pos)
 	if settings.admin_vendor then
@@ -192,8 +192,8 @@ function fancy_vend.get_vendor_log_fs(pos)
 end
 
 function fancy_vend.show_buyer_formspec(player, pos)
-	minetest.show_formspec(player:get_player_name(),
-		"fancy_vend:buyer;"..minetest.pos_to_string(pos),
+	core.show_formspec(player:get_player_name(),
+		"fancy_vend:buyer;"..core.pos_to_string(pos),
 		fancy_vend.get_vendor_buyer_fs(pos, player, nil)
 	)
 end
@@ -204,13 +204,13 @@ function fancy_vend.show_vendor_formspec(player, pos)
 		local status, errorcode = fancy_vend.get_vendor_status(pos)
 		if ((not status and errorcode == "unconfigured")
 					and fancy_vend.can_modify_vendor(pos, player)) or settings.admin_vendor then
-			minetest.show_formspec(player:get_player_name(),
-				"fancy_vend:settings;"..minetest.pos_to_string(pos),
+			core.show_formspec(player:get_player_name(),
+				"fancy_vend:settings;"..core.pos_to_string(pos),
 				fancy_vend.get_vendor_settings_fs(pos)
 			)
 		else
-			minetest.show_formspec(player:get_player_name(),
-				"fancy_vend:default;"..minetest.pos_to_string(pos),
+			core.show_formspec(player:get_player_name(),
+				"fancy_vend:default;"..core.pos_to_string(pos),
 				fancy_vend.get_vendor_default_fs(pos, player)
 			)
 		end