mirror of
https://github.com/minetest-mods/moreblocks.git
synced 2025-06-28 06:12:05 +02:00
Code cleanup, new Stairs+ recipes.
This commit is contained in:
Calinou
@ -1,34 +1,34 @@
|
||||
|
||||
local function register_stairsplus_alias(modname, origname, newname)
|
||||
minetest.register_alias(modname..":slab_"..origname, "moreblocks:slab_"..newname)
|
||||
minetest.register_alias(modname..":slab_"..origname.."_inverted", "moreblocks:slab_"..newname.."_inverted")
|
||||
minetest.register_alias(modname..":slab_"..origname.."_wall", "moreblocks:slab_"..newname.."_wall")
|
||||
minetest.register_alias(modname..":slab_"..origname.."_quarter", "moreblocks:slab_"..newname.."_quarter")
|
||||
minetest.register_alias(modname..":slab_"..origname.."_quarter_inverted", "moreblocks:slab_"..newname.."_quarter_inverted")
|
||||
minetest.register_alias(modname..":slab_"..origname.."_quarter_wall", "moreblocks:slab_"..newname.."_quarter_wall")
|
||||
minetest.register_alias(modname..":slab_"..origname.."_three_quarter", "moreblocks:slab_"..newname.."_three_quarter")
|
||||
minetest.register_alias(modname..":slab_"..origname.."_three_quarter_inverted", "moreblocks:slab_"..newname.."_three_quarter_inverted")
|
||||
minetest.register_alias(modname..":slab_"..origname.."_three_quarter_wall", "moreblocks:slab_"..newname.."_three_quarter_wall")
|
||||
minetest.register_alias(modname..":stair_"..origname, "moreblocks:stair_"..newname)
|
||||
minetest.register_alias(modname..":stair_"..origname.."_inverted", "moreblocks:stair_"..newname.."_inverted")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_wall", "moreblocks:stair_"..newname.."_wall")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_wall_half", "moreblocks:stair_"..newname.."_wall_half")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_wall_half_inverted", "moreblocks:stair_"..newname.."_wall_half_inverted")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_half", "moreblocks:stair_"..newname.."_half")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_half_inverted", "moreblocks:stair_"..newname.."_half_inverted")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_right_half", "moreblocks:stair_"..newname.."_right_half")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_right_half_inverted", "moreblocks:stair_"..newname.."_right_half_inverted")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_wall_half", "moreblocks:stair_"..newname.."_wall_half")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_wall_half_inverted", "moreblocks:stair_"..newname.."_wall_half_inverted")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_inner", "moreblocks:stair_"..newname.."_inner")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_inner_inverted", "moreblocks:stair_"..newname.."_inner_inverted")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_outer", "moreblocks:stair_"..newname.."_outer")
|
||||
minetest.register_alias(modname..":stair_"..origname.."_outer_inverted", "moreblocks:stair_"..newname.."_outer_inverted")
|
||||
minetest.register_alias(modname..":panel_"..origname.."_bottom", "moreblocks:panel_"..newname.."_bottom")
|
||||
minetest.register_alias(modname..":panel_"..origname.."_top", "moreblocks:panel_"..newname.."_top")
|
||||
minetest.register_alias(modname..":panel_"..origname.."_vertical", "moreblocks:panel_"..newname.."_vertical")
|
||||
minetest.register_alias(modname..":micro_"..origname.."_bottom", "moreblocks:micro_"..newname.."_bottom")
|
||||
minetest.register_alias(modname..":micro_"..origname.."_top", "moreblocks:micro_"..newname.."_top")
|
||||
minetest.register_alias(modname.. ":slab_" ..origname, "moreblocks:slab_" ..newname)
|
||||
minetest.register_alias(modname.. ":slab_" ..origname.. "_inverted", "moreblocks:slab_" ..newname.. "_inverted")
|
||||
minetest.register_alias(modname.. ":slab_" ..origname.. "_wall", "moreblocks:slab_" ..newname.. "_wall")
|
||||
minetest.register_alias(modname.. ":slab_" ..origname.. "_quarter", "moreblocks:slab_" ..newname.. "_quarter")
|
||||
minetest.register_alias(modname.. ":slab_" ..origname.. "_quarter_inverted", "moreblocks:slab_" ..newname.. "_quarter_inverted")
|
||||
minetest.register_alias(modname.. ":slab_" ..origname.. "_quarter_wall", "moreblocks:slab_" ..newname.. "_quarter_wall")
|
||||
minetest.register_alias(modname.. ":slab_" ..origname.. "_three_quarter", "moreblocks:slab_" ..newname.. "_three_quarter")
|
||||
minetest.register_alias(modname.. ":slab_" ..origname.. "_three_quarter_inverted", "moreblocks:slab_" ..newname.. "_three_quarter_inverted")
|
||||
minetest.register_alias(modname.. ":slab_" ..origname.. "_three_quarter_wall", "moreblocks:slab_" ..newname.. "_three_quarter_wall")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname, "moreblocks:stair_" ..newname)
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_inverted", "moreblocks:stair_" ..newname.. "_inverted")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_wall", "moreblocks:stair_" ..newname.. "_wall")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_wall_half", "moreblocks:stair_" ..newname.. "_wall_half")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_wall_half_inverted", "moreblocks:stair_" ..newname.. "_wall_half_inverted")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_half", "moreblocks:stair_" ..newname.. "_half")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_half_inverted", "moreblocks:stair_" ..newname.. "_half_inverted")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_right_half", "moreblocks:stair_" ..newname.. "_right_half")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_right_half_inverted", "moreblocks:stair_" ..newname.. "_right_half_inverted")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_wall_half", "moreblocks:stair_" ..newname.. "_wall_half")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_wall_half_inverted", "moreblocks:stair_" ..newname.. "_wall_half_inverted")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_inner", "moreblocks:stair_" ..newname.. "_inner")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_inner_inverted", "moreblocks:stair_" ..newname.. "_inner_inverted")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_outer", "moreblocks:stair_" ..newname.. "_outer")
|
||||
minetest.register_alias(modname.. ":stair_" ..origname.. "_outer_inverted", "moreblocks:stair_" ..newname.. "_outer_inverted")
|
||||
minetest.register_alias(modname.. ":panel_" ..origname.. "_bottom", "moreblocks:panel_" ..newname.. "_bottom")
|
||||
minetest.register_alias(modname.. ":panel_" ..origname.. "_top", "moreblocks:panel_" ..newname.. "_top")
|
||||
minetest.register_alias(modname.. ":panel_" ..origname.. "_vertical", "moreblocks:panel_" ..newname.. "_vertical")
|
||||
minetest.register_alias(modname.. ":micro_" ..origname.. "_bottom", "moreblocks:micro_" ..newname.. "_bottom")
|
||||
minetest.register_alias(modname.. ":micro_" ..origname.. "_top", "moreblocks:micro_" ..newname.. "_top")
|
||||
end
|
||||
|
||||
register_stairsplus_alias("stairsplus", "stone", "stone")
|
||||
|
||||
@ -10,26 +10,26 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
|
||||
--print('ABM for '..modname..' "'..material..'"')
|
||||
|
||||
local objects_list1 = {
|
||||
modname..":slab_"..material.."_inverted",
|
||||
modname..":slab_"..material.."_quarter_inverted",
|
||||
modname..":slab_"..material.."_three_quarter_inverted",
|
||||
modname..":stair_"..material.."_inverted",
|
||||
modname..":stair_"..material.."_wall",
|
||||
modname..":stair_"..material.."_wall_half",
|
||||
modname..":stair_"..material.."_wall_half_inverted",
|
||||
modname..":stair_"..material.."_half_inverted",
|
||||
modname..":stair_"..material.."_right_half_inverted",
|
||||
modname..":panel_"..material.."_vertical",
|
||||
modname..":panel_"..material.."_top",
|
||||
modname.. ":slab_" ..material.. "_inverted",
|
||||
modname.. ":slab_" ..material.. "_quarter_inverted",
|
||||
modname.. ":slab_" ..material.. "_three_quarter_inverted",
|
||||
modname.. ":stair_" ..material.. "_inverted",
|
||||
modname.. ":stair_" ..material.. "_wall",
|
||||
modname.. ":stair_" ..material.. "_wall_half",
|
||||
modname.. ":stair_" ..material.. "_wall_half_inverted",
|
||||
modname.. ":stair_" ..material.. "_half_inverted",
|
||||
modname.. ":stair_" ..material.. "_right_half_inverted",
|
||||
modname.. ":panel_" ..material.. "_vertical",
|
||||
modname.. ":panel_" ..material.. "_top",
|
||||
}
|
||||
|
||||
local objects_list2 = {
|
||||
modname..":slab_"..material.."_wall",
|
||||
modname..":slab_"..material.."_quarter_wall",
|
||||
modname..":slab_"..material.."_three_quarter_wall",
|
||||
modname..":stair_"..material.."_inner_inverted",
|
||||
modname..":stair_"..material.."_outer_inverted",
|
||||
modname..":micro_"..material.."_top"
|
||||
modname.. ":slab_" ..material.. "_wall",
|
||||
modname.. ":slab_" ..material.. "_quarter_wall",
|
||||
modname.. ":slab_" ..material.. "_three_quarter_wall",
|
||||
modname.. ":stair_" ..material.. "_inner_inverted",
|
||||
modname.. ":stair_" ..material.. "_outer_inverted",
|
||||
modname.. ":micro_" ..material.. "_top"
|
||||
}
|
||||
|
||||
for _, object in pairs(objects_list1) do
|
||||
@ -64,8 +64,8 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
|
||||
dest_object = string.gsub(dest_object, "_right_half", "_half")
|
||||
end
|
||||
|
||||
--print(" +---> convert "..object)
|
||||
--print(" | to "..dest_object)
|
||||
--print(" +---> convert " ..object)
|
||||
--print(" | to " ..dest_object)
|
||||
|
||||
minetest.register_abm({
|
||||
nodenames = {object},
|
||||
@ -107,8 +107,8 @@ function stairsplus:register_6dfacedir_conversion(modname, material)
|
||||
dest_object = string.gsub(dest_object, "_wall", "")
|
||||
end
|
||||
|
||||
--print(" +---> convert "..object)
|
||||
--print(" | to "..dest_object)
|
||||
--print(" +---> convert " ..object)
|
||||
--print(" | to " ..dest_object)
|
||||
|
||||
minetest.register_abm({
|
||||
nodenames = {object},
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
-- Nodes will be called <modname>:{stair,slab,panel,micro}_<subname>
|
||||
|
||||
local modpath = minetest.get_modpath("moreblocks").."/stairsplus"
|
||||
local modpath = minetest.get_modpath("moreblocks").. "/stairsplus"
|
||||
|
||||
stairsplus = {}
|
||||
stairsplus.expect_infinite_stacks = false
|
||||
@ -34,10 +34,10 @@ function register_stair_slab_panel_micro(modname, subname, recipeitem, groups, i
|
||||
})
|
||||
end
|
||||
|
||||
-- dofile(modpath.."/aliases.lua") -- Not needed as of Q2 2013, uncomment to fix old maps.
|
||||
-- dofile(modpath.."/conversion.lua") -- Not needed as of Q2 2013, uncomment to fix old maps.
|
||||
dofile(modpath.."/stairs.lua")
|
||||
dofile(modpath.."/slabs.lua")
|
||||
dofile(modpath.."/panels.lua")
|
||||
dofile(modpath.."/microblocks.lua")
|
||||
dofile(modpath.."/registrations.lua")
|
||||
-- dofile(modpath.. "/aliases.lua") -- Not needed as of Q2 2013, uncomment to fix old maps.
|
||||
-- dofile(modpath.. "/conversion.lua") -- Not needed as of Q2 2013, uncomment to fix old maps.
|
||||
dofile(modpath.. "/stairs.lua")
|
||||
dofile(modpath.. "/slabs.lua")
|
||||
dofile(modpath.. "/panels.lua")
|
||||
dofile(modpath.. "/microblocks.lua")
|
||||
dofile(modpath.. "/registrations.lua")
|
||||
|
||||
@ -75,28 +75,43 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields)
|
||||
end
|
||||
def.description = desc
|
||||
if fields.drop then
|
||||
def.drop = modname..":micro_"..fields.drop..alternate
|
||||
def.drop = modname.. ":micro_" ..fields.drop..alternate
|
||||
end
|
||||
minetest.register_node(":"..modname..":micro_"..subname..alternate, def)
|
||||
minetest.register_node(":" ..modname.. ":micro_" ..subname..alternate, def)
|
||||
end
|
||||
|
||||
minetest.register_alias(modname..":micro_"..subname.."_bottom", modname..":micro_"..subname)
|
||||
minetest.register_alias(modname.. ":micro_" ..subname.. "_bottom", modname.. ":micro_" ..subname)
|
||||
|
||||
-- Some saw-less recipes:
|
||||
|
||||
minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = "moreblocks:micro_" .. subname .. " 7",
|
||||
recipe = {"moreblocks:stair_" .. subname .. "_inner"},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "moreblocks:micro_" .. subname .. " 6",
|
||||
recipe = {{"moreblocks:stair_" .. subname}},
|
||||
type = "shapeless",
|
||||
recipe = {"moreblocks:stair_" .. subname},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "moreblocks:micro_" .. subname .. " 4",
|
||||
recipe = {{"moreblocks:slab_" .. subname}},
|
||||
type = "shapeless",
|
||||
output = "moreblocks:micro_" .. subname .. " 5",
|
||||
recipe = {"moreblocks:stair_" .. subname .. "_outer"},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "moreblocks:micro_" .. subname .. " 2",
|
||||
recipe = {{"moreblocks:panel_" .. subname}},
|
||||
type = "shapeless",
|
||||
output = "moreblocks:micro_" .. subname .. " 4",
|
||||
recipe = {"moreblocks:slab_" .. subname},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = "moreblocks:micro_" .. subname .. " 2",
|
||||
recipe = {"moreblocks:panel_" .. subname},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
|
||||
@ -75,11 +75,11 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
|
||||
end
|
||||
def.description = desc
|
||||
if fields.drop then
|
||||
def.drop = modname..":panel_"..fields.drop..alternate
|
||||
def.drop = modname.. ":panel_" ..fields.drop..alternate
|
||||
end
|
||||
minetest.register_node(":"..modname..":panel_"..subname..alternate, def)
|
||||
minetest.register_node(":" ..modname.. ":panel_" ..subname..alternate, def)
|
||||
end
|
||||
minetest.register_alias(modname..":panel_"..subname.."_bottom", modname..":panel_"..subname)
|
||||
minetest.register_alias(modname.. ":panel_" ..subname.. "_bottom", modname.. ":panel_" ..subname)
|
||||
|
||||
-- Some saw-less recipes:
|
||||
|
||||
|
||||
@ -74,11 +74,11 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
|
||||
end
|
||||
def.description = desc
|
||||
if fields.drop then
|
||||
def.drop = modname..":slab_"..fields.drop..alternate
|
||||
def.drop = modname.. ":slab_" ..fields.drop..alternate
|
||||
end
|
||||
minetest.register_node(":"..modname..":slab_"..subname..alternate, def)
|
||||
minetest.register_node(":" ..modname.. ":slab_" ..subname..alternate, def)
|
||||
end
|
||||
minetest.register_alias("stairs:slab_"..subname, modname..":slab_"..subname)
|
||||
minetest.register_alias("stairs:slab_" ..subname, modname.. ":slab_" ..subname)
|
||||
|
||||
-- Some saw-less recipes:
|
||||
|
||||
@ -94,9 +94,16 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = "moreblocks:slab_" .. subname,
|
||||
recipe = {"moreblocks:panel_" .. subname, "moreblocks:panel_" .. subname},
|
||||
recipe = {{"moreblocks:panel_" .. subname, "moreblocks:panel_" .. subname}},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "moreblocks:slab_" .. subname,
|
||||
recipe = {
|
||||
{"moreblocks:panel_" .. subname},
|
||||
{"moreblocks:panel_" .. subname},
|
||||
},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
|
||||
@ -115,11 +115,11 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
|
||||
end
|
||||
def.description = desc
|
||||
if fields.drop then
|
||||
def.drop = modname..":stair_"..fields.drop..alternate
|
||||
def.drop = modname.. ":stair_" ..fields.drop..alternate
|
||||
end
|
||||
minetest.register_node(":"..modname..":stair_"..subname..alternate, def)
|
||||
minetest.register_node(":" ..modname.. ":stair_" ..subname..alternate, def)
|
||||
end
|
||||
minetest.register_alias(":stairs:stair_"..subname, modname..":stair_"..subname)
|
||||
minetest.register_alias(":stairs:stair_" ..subname, modname.. ":stair_" ..subname)
|
||||
|
||||
-- Some saw-less recipes:
|
||||
|
||||
@ -206,4 +206,20 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
|
||||
output = "moreblocks:stair_" .. subname,
|
||||
recipe = {"moreblocks:panel_" .. subname, "moreblocks:panel_" .. subname, "moreblocks:panel_" .. subname},
|
||||
})
|
||||
|
||||
minetest.register_craft({ -- See mirrored variation of the recipe below.
|
||||
output = "moreblocks:stair_" .. subname .. "_alt",
|
||||
recipe = {
|
||||
{"moreblocks:panel_" .. subname, ""},
|
||||
{"" , "moreblocks:panel_" .. subname},
|
||||
},
|
||||
})
|
||||
|
||||
minetest.register_craft({ -- Mirrored variation of the recipe above.
|
||||
output = "moreblocks:stair_" .. subname .. "_alt",
|
||||
recipe = {
|
||||
{"" , "moreblocks:panel_" .. subname},
|
||||
{"moreblocks:panel_" .. subname, ""},
|
||||
},
|
||||
})
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user