nalc/nalc_game
1
0
Fork 1
forked from minetest/minetest_game
Code Issues Pull Requests Releases Wiki Activity

Fix modname prefix in stairs and slab functions

Browse Source
This commit is contained in:
PilzAdam 2012-12-16 19:52:13 +01:00
parent 73d078fd27
commit 8c977451a8
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mods/stairs/init.lua
View File

@ -3,9 +3,10 @@
stairs = {} stairs = {}
-- Node will be called stairs:stair_<subname> -- Node will be called modname:stair_<subname>
function stairs.register_stair(subname, recipeitem, groups, images, description, sounds) function stairs.register_stair(subname, recipeitem, groups, images, description, sounds)
minetest.register_node("stairs:stair_" .. subname, { local modname = minetest.get_current_modname()
minetest.register_node(modname..":stair_" .. subname, {
description = description, description = description,
drawtype = "nodebox", drawtype = "nodebox",
tiles = images, tiles = images,
@ -29,7 +30,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("stairs:stair_" .. subname.."upside_down") local fakestack = ItemStack(modname..":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()
@ -42,8 +43,8 @@ function stairs.register_stair(subname, recipeitem, groups, images, description,
end, end,
}) })
minetest.register_node("stairs:stair_" .. subname.."upside_down", { minetest.register_node(modname..":stair_" .. subname.."upside_down", {
drop = "stairs:stair_" .. subname, drop = modname..":stair_" .. subname,
drawtype = "nodebox", drawtype = "nodebox",
tiles = images, tiles = images,
paramtype = "light", paramtype = "light",
@ -61,7 +62,7 @@ function stairs.register_stair(subname, recipeitem, groups, images, description,
}) })
minetest.register_craft({ minetest.register_craft({
output = 'stairs:stair_' .. subname .. ' 4', output = modname..':stair_' .. subname .. ' 4',
recipe = { recipe = {
{recipeitem, "", ""}, {recipeitem, "", ""},
{recipeitem, recipeitem, ""}, {recipeitem, recipeitem, ""},
@ -71,7 +72,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 = 'stairs:stair_' .. subname .. ' 4', output = modname..':stair_' .. subname .. ' 4',
recipe = { recipe = {
{"", "", recipeitem}, {"", "", recipeitem},
{"", recipeitem, recipeitem}, {"", recipeitem, recipeitem},
@ -80,9 +81,10 @@ function stairs.register_stair(subname, recipeitem, groups, images, description,
}) })
end end
-- Node will be called stairs:slab_<subname> -- Node will be called modname:slab_<subname>
function stairs.register_slab(subname, recipeitem, groups, images, description, sounds) function stairs.register_slab(subname, recipeitem, groups, images, description, sounds)
minetest.register_node("stairs:slab_" .. subname, { local modname = minetest.get_current_modname()
minetest.register_node(modname..":slab_" .. subname, {
description = description, description = description,
drawtype = "nodebox", drawtype = "nodebox",
tiles = images, tiles = images,
@ -110,7 +112,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 == "stairs:slab_" .. subname and if n0.name == modname..":slab_" .. subname and
p0.y+1 == p1.y then p0.y+1 == p1.y then
slabpos = p0 slabpos = p0
slabnode = n0 slabnode = n0
@ -135,7 +137,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 == "stairs:slab_" .. subname.."upside_down" then if n0.name == modname..":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
@ -153,7 +155,7 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
end end
-- Place upside down slab -- Place upside down slab
local fakestack = ItemStack("stairs:slab_" .. subname.."upside_down") local fakestack = ItemStack(modname..":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()
@ -162,10 +164,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 == "stairs:slab_" .. subname.."upside_down" and if n0.name == modname..":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("stairs:slab_" .. subname.."upside_down") local fakestack = ItemStack(modname..":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()
@ -178,8 +180,8 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
end, end,
}) })
minetest.register_node("stairs:slab_" .. subname.."upside_down", { minetest.register_node(modname..":slab_" .. subname.."upside_down", {
drop = "stairs:slab_"..subname, drop = modname..":slab_"..subname,
drawtype = "nodebox", drawtype = "nodebox",
tiles = images, tiles = images,
paramtype = "light", paramtype = "light",
@ -197,14 +199,14 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
}) })
minetest.register_craft({ minetest.register_craft({
output = 'stairs:slab_' .. subname .. ' 3', output = modname..':slab_' .. subname .. ' 3',
recipe = { recipe = {
{recipeitem, recipeitem, recipeitem}, {recipeitem, recipeitem, recipeitem},
}, },
}) })
end end
-- Nodes will be called stairs:{stair,slab}_<subname> -- Nodes will be called modname:{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)