use nondeprecated namespace - minetest to core (#98)

fake_fire/init.lua

@@ -1,10 +1,10 @@
-local S = minetest.get_translator("fake_fire")
+local S = core.get_translator("fake_fire")
 
 local fake_fire_reload_particles_nodes = {}
 
 local function fire_particles_on(pos) -- 3 layers of fire
-	local meta = minetest.get_meta(pos)
-	local id1 = minetest.add_particlespawner({ -- 1 layer big particles fire
+	local meta = core.get_meta(pos)
+	local id1 = core.add_particlespawner({ -- 1 layer big particles fire
 		amount = 9,
 		time = 0,
 		minpos = {x = pos.x - 0.2, y = pos.y - 0.4, z = pos.z - 0.2},
@@ -24,7 +24,7 @@ local function fire_particles_on(pos) -- 3 layers of fire
 	})
 	meta:set_int("layer_1", id1)
 
-	local id2 = minetest.add_particlespawner({ -- 2 layer smol particles fire
+	local id2 = core.add_particlespawner({ -- 2 layer smol particles fire
 		amount = 1,
 		time = 0,
 		minpos = {x = pos.x - 0.1, y = pos.y, z = pos.z - 0.1},
@@ -44,7 +44,7 @@ local function fire_particles_on(pos) -- 3 layers of fire
 	})
 	meta:set_int("layer_2", id2)
 
-	local id3 = minetest.add_particlespawner({ --3 layer smoke
+	local id3 = core.add_particlespawner({ --3 layer smoke
 		amount = 1,
 		time = 0,
 		minpos = {x = pos.x - 0.1, y = pos.y - 0.2, z = pos.z - 0.1},
@@ -66,35 +66,35 @@ local function fire_particles_on(pos) -- 3 layers of fire
 end
 
 local function fire_particles_off(pos)
-	local meta = minetest.get_meta(pos)
+	local meta = core.get_meta(pos)
 	local id_1 = meta:get_int("layer_1");
 	local id_2 = meta:get_int("layer_2");
 	local id_3 = meta:get_int("layer_3");
-	minetest.delete_particlespawner(id_1)
-	minetest.delete_particlespawner(id_2)
-	minetest.delete_particlespawner(id_3)
+	core.delete_particlespawner(id_1)
+	core.delete_particlespawner(id_2)
+	core.delete_particlespawner(id_3)
 end
 
 local function start_fire_effects(pos, node, clicker, chimney)
-	local this_spawner_meta = minetest.get_meta(pos)
+	local this_spawner_meta = core.get_meta(pos)
 	local id = this_spawner_meta:get_int("smoky")
 	local s_handle = this_spawner_meta:get_int("sound")
-	local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name
+	local above = core.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name
 
 	if id ~= 0 then
 		if s_handle then
-			minetest.after(0, function(handle)
-				minetest.sound_stop(handle)
+			core.after(0, function(handle)
+				core.sound_stop(handle)
 			end, s_handle)
 		end
-		minetest.delete_particlespawner(id)
+		core.delete_particlespawner(id)
 		this_spawner_meta:set_int("smoky", 0)
 		this_spawner_meta:set_int("sound", 0)
 		return
 	end
 
 	if above == "air" and (not id or id == 0) then
-		id = minetest.add_particlespawner({
+		id = core.add_particlespawner({
 			amount = 4, time = 0, collisiondetection = true,
 			minpos = {x=pos.x-0.25, y=pos.y+0.4, z=pos.z-0.25},
 			maxpos = {x=pos.x+0.25, y=pos.y+5, z=pos.z+0.25},
@@ -108,7 +108,7 @@ local function start_fire_effects(pos, node, clicker, chimney)
 		if chimney == 1 then
 			this_spawner_meta:set_int("sound", 0)
 		else
-			s_handle = minetest.sound_play("fire_small", {
+			s_handle = core.sound_play("fire_small", {
 				pos = pos,
 				max_hear_distance = 5,
 				loop = true
@@ -121,17 +121,17 @@ local function start_fire_effects(pos, node, clicker, chimney)
 end
 
 local function stop_smoke(pos)
-	local this_spawner_meta = minetest.get_meta(pos)
+	local this_spawner_meta = core.get_meta(pos)
 	local id = this_spawner_meta:get_int("smoky")
 	local s_handle = this_spawner_meta:get_int("sound")
 
 	if id ~= 0 then
-		minetest.delete_particlespawner(id)
+		core.delete_particlespawner(id)
 	end
 
 	if s_handle then
-		minetest.after(0, function(handle)
-			minetest.sound_stop(handle)
+		core.after(0, function(handle)
+			core.sound_stop(handle)
 		end, s_handle)
 	end
 
@@ -139,7 +139,7 @@ local function stop_smoke(pos)
 	this_spawner_meta:set_int("sound", 0)
 end
 
-minetest.register_node("fake_fire:ice_fire", {
+core.register_node("fake_fire:ice_fire", {
 	inventory_image = "ice_fire_inv.png",
 	description = S("Ice fire"),
 	drawtype = "plantlike",
@@ -164,14 +164,14 @@ minetest.register_node("fake_fire:ice_fire", {
 	on_destruct = function (pos)
 		stop_smoke(pos)
 		fire_particles_off(pos)
-		minetest.sound_play("fire_extinguish", {
+		core.sound_play("fire_extinguish", {
 			pos = pos, max_hear_distance = 5
 		})
 	end,
 	drop = ""
 })
 
-minetest.register_alias("fake_fire:fake_fire", "fire:permanent_flame")
+core.register_alias("fake_fire:fake_fire", "fire:permanent_flame")
 
 local sbox = {
 	type = 'fixed',
@@ -180,7 +180,7 @@ local sbox = {
 
 local wtex = homedecor.textures.wood.jungle.planks
 
-minetest.register_node("fake_fire:fancy_fire", {
+core.register_node("fake_fire:fancy_fire", {
 	inventory_image = "fancy_fire_inv.png",
 	description = S("Fancy Fire"),
 	drawtype = "mesh",
@@ -212,7 +212,7 @@ minetest.register_node("fake_fire:fancy_fire", {
 	end,
 	on_destruct = function(pos, oldnode, oldmetadata, digger)
 		fire_particles_off(pos)
-		minetest.sound_play("fire_extinguish", {
+		core.sound_play("fire_extinguish", {
 			pos = pos, max_hear_distance = 5
 		})
 	end,
@@ -228,7 +228,7 @@ minetest.register_node("fake_fire:fancy_fire", {
 })
 
 -- EMBERS
-minetest.register_node("fake_fire:embers", {
+core.register_node("fake_fire:embers", {
     description = S("Glowing Embers"),
 	tiles = {
 		{name="embers_animated.png", animation={type="vertical_frames",
@@ -245,12 +245,12 @@ minetest.register_node("fake_fire:embers", {
 })
 
 local sandstone_tex = "default_sandstone.png"
-if not minetest.get_modpath("default") then
-	local sname = minetest.registered_nodes["mapgen_stone"].name
+if not core.get_modpath("default") then
+	local sname = core.registered_nodes["mapgen_stone"].name
 	local names = sname:split(":")
 	local nitem = names[2] and string.gsub(names[2], "stone", "sandstone") or nil
-	if nitem and minetest.registered_nodes[names[1]..":"..nitem] then
-		sandstone_tex = minetest.registered_nodes[names[1]..":"..nitem].tiles[1]
+	if nitem and core.registered_nodes[names[1]..":"..nitem] then
+		sandstone_tex = core.registered_nodes[names[1]..":"..nitem].tiles[1]
 	else
 		sandstone_tex = "[combine:16x16^[noalpha^[colorize:#fefebe"
 	end
@@ -258,14 +258,14 @@ end
 
 -- CHIMNEYS
 local materials = {
-	{ "stone",     S("Stone chimney top"), minetest.registered_nodes["mapgen_stone"].tiles[1] },
+	{ "stone",     S("Stone chimney top"), core.registered_nodes["mapgen_stone"].tiles[1] },
 	{ "sandstone", S("Sandstone chimney top"), sandstone_tex },
 }
 
 for _, mat in ipairs(materials) do
 	local name, desc, tex = unpack(mat)
 	table.insert(fake_fire_reload_particles_nodes, "fake_fire:chimney_top_"..name)
-	minetest.register_node("fake_fire:chimney_top_"..name, {
+	core.register_node("fake_fire:chimney_top_"..name, {
 		description = desc,
 		tiles = {tex.."^chimney_top.png", tex},
 		groups = {snappy=3, dig_stone=2, handy=1},
@@ -290,8 +290,8 @@ for _, mat in ipairs(materials) do
 		end
 	})
 
-	if minetest.get_modpath("default") then
-		minetest.register_craft({
+	if core.get_modpath("default") then
+		core.register_craft({
 			type = "shapeless",
 			output = 'fake_fire:chimney_top_'..name,
 			recipe = {"default:torch", "stairs:slab_"..name}
@@ -299,28 +299,28 @@ for _, mat in ipairs(materials) do
 	end
 end
 
-minetest.register_alias("fake_fire:flint_and_steel", "fire:flint_and_steel")
+core.register_alias("fake_fire:flint_and_steel", "fire:flint_and_steel")
 
-if minetest.get_modpath("default") then
-	minetest.override_item("default:ice", {
+if core.get_modpath("default") then
+	core.override_item("default:ice", {
 		on_ignite = function(pos, igniter)
 			local flame_pos = {x = pos.x, y = pos.y + 1, z = pos.z}
-			if minetest.get_node(flame_pos).name == "air" then
-				minetest.set_node(flame_pos, {name = "fake_fire:ice_fire"})
+			if core.get_node(flame_pos).name == "air" then
+				core.set_node(flame_pos, {name = "fake_fire:ice_fire"})
 			end
 		end
 	})
 end
 
 -- CRAFTS
-if minetest.get_modpath("default") then
-	minetest.register_craft({
+if core.get_modpath("default") then
+	core.register_craft({
 		type = "shapeless",
 		output = 'fake_fire:embers',
 		recipe = {"default:torch", "group:wood", "default:torch"}
 	})
 
-	minetest.register_craft({
+	core.register_craft({
 		type = "shapeless",
 		output = 'fake_fire:fancy_fire',
 		recipe = {"default:torch", "building_blocks:sticks", "default:torch" }
@@ -329,15 +329,15 @@ end
 
 -- ALIASES
 
-minetest.register_alias("fake_fire:smokeless_fire", "fake_fire:fake_fire")
-minetest.register_alias("fake_fire:smokeless_ice_fire", "fake_fire:ice_fire")
-minetest.register_alias("fake_fire:smokeless_chimney_top_stone", "fake_fire:chimney_top_stone")
-minetest.register_alias("fake_fire:smokeless_chimney_top_sandstone", "fake_fire:chimney_top_sandstone")
-minetest.register_alias("fake_fire:flint", "fake_fire:flint_and_steel")
+core.register_alias("fake_fire:smokeless_fire", "fake_fire:fake_fire")
+core.register_alias("fake_fire:smokeless_ice_fire", "fake_fire:ice_fire")
+core.register_alias("fake_fire:smokeless_chimney_top_stone", "fake_fire:chimney_top_stone")
+core.register_alias("fake_fire:smokeless_chimney_top_sandstone", "fake_fire:chimney_top_sandstone")
+core.register_alias("fake_fire:flint", "fake_fire:flint_and_steel")
 
 -- OTHER
 
-minetest.register_lbm({
+core.register_lbm({
 	name = "fake_fire:reload_particles",
 	label = "restart fire particles on reload",
 	nodenames = { "fake_fire:fancy_fire" },
@@ -348,13 +348,13 @@ minetest.register_lbm({
 	end
 })
 
-minetest.register_lbm({
+core.register_lbm({
 	name = "fake_fire:reload_particles_chimney",
 	label = "restart chimney smoke on reload",
 	nodenames = fake_fire_reload_particles_nodes,
 	run_at_every_load = true,
 	action = function(pos, node)
-		if minetest.get_meta(pos):get_int("smoky") ~= 0 then
+		if core.get_meta(pos):get_int("smoky") ~= 0 then
 			stop_smoke(pos)
 			start_fire_effects(pos, node, nil, 1)
 		end