forked from luanti-org/minetest_game
		
	Fix incorrect slabs to full block transformation by changing the modname to 'stairs' for all stairs and slabs
This commit is contained in:
		@@ -3,10 +3,9 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
stairs = {}
 | 
					stairs = {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- Node will be called modname:stair_<subname>
 | 
					-- Node will be called stairs:stair_<subname>
 | 
				
			||||||
function stairs.register_stair(subname, recipeitem, groups, images, description, sounds)
 | 
					function stairs.register_stair(subname, recipeitem, groups, images, description, sounds)
 | 
				
			||||||
	local modname = minetest.get_current_modname()
 | 
						minetest.register_node(":stairs:stair_" .. subname, {
 | 
				
			||||||
	minetest.register_node(modname..":stair_" .. subname, {
 | 
					 | 
				
			||||||
		description = description,
 | 
							description = description,
 | 
				
			||||||
		drawtype = "nodebox",
 | 
							drawtype = "nodebox",
 | 
				
			||||||
		tiles = images,
 | 
							tiles = images,
 | 
				
			||||||
@@ -30,7 +29,7 @@ function stairs.register_stair(subname, recipeitem, groups, images, description,
 | 
				
			|||||||
			local p0 = pointed_thing.under
 | 
								local p0 = pointed_thing.under
 | 
				
			||||||
			local p1 = pointed_thing.above
 | 
								local p1 = pointed_thing.above
 | 
				
			||||||
			if p0.y-1 == p1.y then
 | 
								if p0.y-1 == p1.y then
 | 
				
			||||||
				local fakestack = ItemStack(modname..":stair_" .. subname.."upside_down")
 | 
									local fakestack = ItemStack("stairs:stair_" .. subname.."upside_down")
 | 
				
			||||||
				local ret = minetest.item_place(fakestack, placer, pointed_thing)
 | 
									local ret = minetest.item_place(fakestack, placer, pointed_thing)
 | 
				
			||||||
				if ret:is_empty() then
 | 
									if ret:is_empty() then
 | 
				
			||||||
					itemstack:take_item()
 | 
										itemstack:take_item()
 | 
				
			||||||
@@ -43,8 +42,8 @@ function stairs.register_stair(subname, recipeitem, groups, images, description,
 | 
				
			|||||||
		end,
 | 
							end,
 | 
				
			||||||
	})
 | 
						})
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	minetest.register_node(modname..":stair_" .. subname.."upside_down", {
 | 
						minetest.register_node(":stairs:stair_" .. subname.."upside_down", {
 | 
				
			||||||
		drop = modname..":stair_" .. subname,
 | 
							drop = "stairs:stair_" .. subname,
 | 
				
			||||||
		drawtype = "nodebox",
 | 
							drawtype = "nodebox",
 | 
				
			||||||
		tiles = images,
 | 
							tiles = images,
 | 
				
			||||||
		paramtype = "light",
 | 
							paramtype = "light",
 | 
				
			||||||
@@ -62,7 +61,7 @@ function stairs.register_stair(subname, recipeitem, groups, images, description,
 | 
				
			|||||||
	})
 | 
						})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	minetest.register_craft({
 | 
						minetest.register_craft({
 | 
				
			||||||
		output = modname..':stair_' .. subname .. ' 4',
 | 
							output = 'stairs:stair_' .. subname .. ' 4',
 | 
				
			||||||
		recipe = {
 | 
							recipe = {
 | 
				
			||||||
			{recipeitem, "", ""},
 | 
								{recipeitem, "", ""},
 | 
				
			||||||
			{recipeitem, recipeitem, ""},
 | 
								{recipeitem, recipeitem, ""},
 | 
				
			||||||
@@ -72,7 +71,7 @@ function stairs.register_stair(subname, recipeitem, groups, images, description,
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	-- Flipped recipe for the silly minecrafters
 | 
						-- Flipped recipe for the silly minecrafters
 | 
				
			||||||
	minetest.register_craft({
 | 
						minetest.register_craft({
 | 
				
			||||||
		output = modname..':stair_' .. subname .. ' 4',
 | 
							output = 'stairs:stair_' .. subname .. ' 4',
 | 
				
			||||||
		recipe = {
 | 
							recipe = {
 | 
				
			||||||
			{"", "", recipeitem},
 | 
								{"", "", recipeitem},
 | 
				
			||||||
			{"", recipeitem, recipeitem},
 | 
								{"", recipeitem, recipeitem},
 | 
				
			||||||
@@ -81,10 +80,9 @@ function stairs.register_stair(subname, recipeitem, groups, images, description,
 | 
				
			|||||||
	})
 | 
						})
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- Node will be called modname:slab_<subname>
 | 
					-- Node will be called stairs:slab_<subname>
 | 
				
			||||||
function stairs.register_slab(subname, recipeitem, groups, images, description, sounds)
 | 
					function stairs.register_slab(subname, recipeitem, groups, images, description, sounds)
 | 
				
			||||||
	local modname = minetest.get_current_modname()
 | 
						minetest.register_node(":stairs:slab_" .. subname, {
 | 
				
			||||||
	minetest.register_node(modname..":slab_" .. subname, {
 | 
					 | 
				
			||||||
		description = description,
 | 
							description = description,
 | 
				
			||||||
		drawtype = "nodebox",
 | 
							drawtype = "nodebox",
 | 
				
			||||||
		tiles = images,
 | 
							tiles = images,
 | 
				
			||||||
@@ -112,7 +110,7 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
 | 
				
			|||||||
			local p0 = pointed_thing.under
 | 
								local p0 = pointed_thing.under
 | 
				
			||||||
			local p1 = pointed_thing.above
 | 
								local p1 = pointed_thing.above
 | 
				
			||||||
			local n0 = minetest.env:get_node(p0)
 | 
								local n0 = minetest.env:get_node(p0)
 | 
				
			||||||
			if n0.name == modname..":slab_" .. subname and
 | 
								if n0.name == "stairs:slab_" .. subname and
 | 
				
			||||||
					p0.y+1 == p1.y then
 | 
										p0.y+1 == p1.y then
 | 
				
			||||||
				slabpos = p0
 | 
									slabpos = p0
 | 
				
			||||||
				slabnode = n0
 | 
									slabnode = n0
 | 
				
			||||||
@@ -137,7 +135,7 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
 | 
				
			|||||||
			-- Upside down slabs
 | 
								-- Upside down slabs
 | 
				
			||||||
			if p0.y-1 == p1.y then
 | 
								if p0.y-1 == p1.y then
 | 
				
			||||||
				-- Turn into full block if pointing at a existing slab
 | 
									-- Turn into full block if pointing at a existing slab
 | 
				
			||||||
				if n0.name == modname..":slab_" .. subname.."upside_down" then
 | 
									if n0.name == "stairs:slab_" .. subname.."upside_down" then
 | 
				
			||||||
					-- Remove the slab at the position of the slab
 | 
										-- Remove the slab at the position of the slab
 | 
				
			||||||
					minetest.env:remove_node(p0)
 | 
										minetest.env:remove_node(p0)
 | 
				
			||||||
					-- Make a fake stack of a single item and try to place it
 | 
										-- Make a fake stack of a single item and try to place it
 | 
				
			||||||
@@ -155,7 +153,7 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
 | 
				
			|||||||
				end
 | 
									end
 | 
				
			||||||
				
 | 
									
 | 
				
			||||||
				-- Place upside down slab
 | 
									-- Place upside down slab
 | 
				
			||||||
				local fakestack = ItemStack(modname..":slab_" .. subname.."upside_down")
 | 
									local fakestack = ItemStack("stairs:slab_" .. subname.."upside_down")
 | 
				
			||||||
				local ret = minetest.item_place(fakestack, placer, pointed_thing)
 | 
									local ret = minetest.item_place(fakestack, placer, pointed_thing)
 | 
				
			||||||
				if ret:is_empty() then
 | 
									if ret:is_empty() then
 | 
				
			||||||
					itemstack:take_item()
 | 
										itemstack:take_item()
 | 
				
			||||||
@@ -164,10 +162,10 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
 | 
				
			|||||||
			end
 | 
								end
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
			-- If pointing at the side of a upside down slab
 | 
								-- If pointing at the side of a upside down slab
 | 
				
			||||||
			if n0.name == modname..":slab_" .. subname.."upside_down" and
 | 
								if n0.name == "stairs:slab_" .. subname.."upside_down" and
 | 
				
			||||||
					p0.y+1 ~= p1.y then
 | 
										p0.y+1 ~= p1.y then
 | 
				
			||||||
				-- Place upside down slab
 | 
									-- Place upside down slab
 | 
				
			||||||
				local fakestack = ItemStack(modname..":slab_" .. subname.."upside_down")
 | 
									local fakestack = ItemStack("stairs:slab_" .. subname.."upside_down")
 | 
				
			||||||
				local ret = minetest.item_place(fakestack, placer, pointed_thing)
 | 
									local ret = minetest.item_place(fakestack, placer, pointed_thing)
 | 
				
			||||||
				if ret:is_empty() then
 | 
									if ret:is_empty() then
 | 
				
			||||||
					itemstack:take_item()
 | 
										itemstack:take_item()
 | 
				
			||||||
@@ -180,8 +178,8 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
 | 
				
			|||||||
		end,
 | 
							end,
 | 
				
			||||||
	})
 | 
						})
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	minetest.register_node(modname..":slab_" .. subname.."upside_down", {
 | 
						minetest.register_node(":stairs:slab_" .. subname.."upside_down", {
 | 
				
			||||||
		drop = modname..":slab_"..subname,
 | 
							drop = "stairs:slab_"..subname,
 | 
				
			||||||
		drawtype = "nodebox",
 | 
							drawtype = "nodebox",
 | 
				
			||||||
		tiles = images,
 | 
							tiles = images,
 | 
				
			||||||
		paramtype = "light",
 | 
							paramtype = "light",
 | 
				
			||||||
@@ -199,14 +197,14 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
 | 
				
			|||||||
	})
 | 
						})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	minetest.register_craft({
 | 
						minetest.register_craft({
 | 
				
			||||||
		output = modname..':slab_' .. subname .. ' 3',
 | 
							output = 'stairs:slab_' .. subname .. ' 3',
 | 
				
			||||||
		recipe = {
 | 
							recipe = {
 | 
				
			||||||
			{recipeitem, recipeitem, recipeitem},
 | 
								{recipeitem, recipeitem, recipeitem},
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
	})
 | 
						})
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- Nodes will be called modname:{stair,slab}_<subname>
 | 
					-- Nodes will be called stairs:{stair,slab}_<subname>
 | 
				
			||||||
function stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab, sounds)
 | 
					function stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab, sounds)
 | 
				
			||||||
	stairs.register_stair(subname, recipeitem, groups, images, desc_stair, sounds)
 | 
						stairs.register_stair(subname, recipeitem, groups, images, desc_stair, sounds)
 | 
				
			||||||
	stairs.register_slab(subname, recipeitem, groups, images, desc_slab, sounds)
 | 
						stairs.register_slab(subname, recipeitem, groups, images, desc_slab, sounds)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user