nalc/server-nalc
1
0
Fork 0
mirror of https://github.com/sys4-fr/server-nalc.git synced 2025-06-28 06:11:47 +02:00
Code Issues Releases Wiki Activity

[moreblocks] Updates

Browse Source 
- Fix #302
- Add cherry tree/wood to the list of sawable items
This commit is contained in:
LeMagnesium
2015-10-11 16:16:22 +02:00
parent 11c8a7f060
commit 61822023cf
24 changed files with 587 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mods/moreblocks/stairsplus/microblocks.lua
View File

@ -110,6 +110,18 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields)
recipe = {modname .. ":slab_" .. subname},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":micro_" .. subname .. " 4",
recipe = {modname .. ":stair_" .. subname .. "_alt"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":micro_" .. subname .. " 3",
recipe = {modname .. ":stair_" .. subname .. "_right_half"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":micro_" .. subname .. " 2",

12
mods/moreblocks/stairsplus/registrations.lua
View File

@ -18,18 +18,24 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks:
"diamondblock",
"desert_stone",
"desert_cobble",
"meselamp",
"glass",
"tree",
"wood",
"jungletree",
"junglewood",
"pinetree",
"pinewood",
"pine_tree",
"pine_wood",
"cherry_tree",
"cherry_plank",
"acacia_tree",
"acacia_wood",
"obsidian",
"obsidian_glass",
"stonebrick",
"desert_stonebrick",
"sandstonebrick",
"obsidianbrick",
}
for _, name in pairs(default_nodes) do
@ -54,7 +60,7 @@ for _, name in pairs(default_nodes) do
sounds = ndef.sounds,
tiles = ndef.tiles,
sunlight_propagates = true,
light_source = ndef.light_source
})
end
end

112
mods/moreblocks/stairsplus/slabs.lua
View File

@ -66,6 +66,15 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
recipe = {modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname, modname .. ":micro_" .. subname},
})
-- uncomment this rule when conflict is no longer likely to happen
-- https://github.com/minetest/minetest/issues/2881
-- minetest.register_craft({
-- type = "shapeless",
-- output = modname .. ":slab_" .. subname,
-- recipe = {modname .. ":panel_" .. subname, modname .. ":panel_" .. subname},
-- })
-- then remove these two
minetest.register_craft({
output = modname .. ":slab_" .. subname,
recipe = {{modname .. ":panel_" .. subname, modname .. ":panel_" .. subname}},
@ -78,6 +87,7 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
{modname .. ":panel_" .. subname},
},
})
------------------------------
minetest.register_craft({
type = "shapeless",
@ -85,6 +95,108 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
recipe = {modname .. ":slab_" .. subname, modname .. ":slab_" .. subname},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_three_quarter", modname .. ":slab_" .. subname .. "_quarter"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_14", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slab_" .. subname .. "_15", modname .. ":slab_" .. subname .. "_1"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_quarter",
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_quarter",
recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_2",
recipe = {modname .. ":slab_" .. subname .. "_1", modname .. ":slab_" .. subname .. "_1"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_three_quarter",
recipe = {modname .. ":slab_" .. subname, modname .. ":slab_" .. subname .. "_quarter"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_three_quarter",
recipe = {modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter", modname .. ":slab_" .. subname .. "_quarter"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_three_quarter",
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_14",
recipe = {modname .. ":slab_" .. subname .. "_three_quarter", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_14",
recipe = {modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2", modname .. ":slab_" .. subname .. "_2"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. "_15",
recipe = {modname .. ":slab_" .. subname .. "_14", modname .. ":slab_" .. subname .. "_1"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname .. " 3",

261
mods/moreblocks/stairsplus/slopes.lua
View File

@ -160,6 +160,24 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
selection_box = box_slope_inner_half_raised,
},
--==============================================================
["_inner_cut"] = {
mesh = "moreblocks_slope_inner_cut.obj",
collision_box = box_slope_inner,
selection_box = box_slope_inner,
},
["_inner_cut_half"] = {
mesh = "moreblocks_slope_inner_cut_half.obj",
collision_box = box_slope_inner_half,
selection_box = box_slope_inner_half,
},
["_inner_cut_half_raised"] = {
mesh = "moreblocks_slope_inner_cut_half_raised.obj",
collision_box = box_slope_inner_half_raised,
selection_box = box_slope_inner_half_raised,
},
--==============================================================
["_outer"] = {
@ -195,6 +213,11 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
collision_box = box_slope_outer_half_raised,
selection_box = box_slope_outer_half_raised,
},
["_cut"] = {
mesh = "moreblocks_slope_cut.obj",
collision_box = box_slope_outer,
selection_box = box_slope_outer,
},
}
local desc = S("%s Slope"):format(fields.description)
@ -215,180 +238,12 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
-- Some saw-less recipes:
minetest.register_craft({
output = modname .. ":slope_" .. subname .. " 7",
recipe = {
{modname .. ":panel_" .. subname, "", ""},
{recipeitem, modname .. ":panel_" .. subname, ""},
{recipeitem, recipeitem, modname .. ":panel_" .. subname},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. " 7",
recipe = {
{"", "", modname .. ":panel_" .. subname},
{"", modname .. ":panel_" .. subname, recipeitem},
{modname .. ":panel_" .. subname, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_half 10",
recipe = {
{modname .. ":panel_" .. subname, "", ""},
{recipeitem, recipeitem, modname .. ":panel_" .. subname},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_half 10",
recipe = {
{"", "", modname .. ":panel_" .. subname},
{modname .. ":panel_" .. subname, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_half_raised 7",
recipe = {
{modname .. ":panel_" .. subname, "", ""},
{recipeitem, recipeitem, modname .. ":panel_" .. subname},
{recipeitem, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_half_raised 7",
recipe = {
{"", "", modname .. ":panel_" .. subname},
{modname .. ":panel_" .. subname, recipeitem, recipeitem},
{recipeitem, recipeitem, recipeitem},
},
})
--===================================================== Inner ==
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_inner 7",
recipe = {
{modname .. ":stair_" .. subname .. "_half", "", ""},
{recipeitem, modname .. ":stair_" .. subname .. "_half", ""},
{recipeitem, recipeitem, modname .. ":stair_" .. subname .. "_half"},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_inner 7",
recipe = {
{"", "", modname .. ":stair_" .. subname .. "_half"},
{"", modname .. ":stair_" .. subname .. "_half", recipeitem},
{modname .. ":stair_" .. subname .. "_half", recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_inner_half 10",
recipe = {
{modname .. ":stair_" .. subname .. "_half", "", ""},
{recipeitem, recipeitem, modname .. ":stair_" .. subname .. "_half"},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_inner_half 10",
recipe = {
{"", "", modname .. ":stair_" .. subname .. "_half"},
{modname .. ":stair_" .. subname .. "_half", recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_inner_half_raised 7",
recipe = {
{modname .. ":stair_" .. subname .. "_half", "", ""},
{recipeitem, recipeitem, modname .. ":stair_" .. subname .. "_half"},
{recipeitem, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_inner_half_raised 7",
recipe = {
{"", "", modname .. ":stair_" .. subname .. "_half"},
{modname .. ":stair_" .. subname .. "_half", recipeitem, recipeitem},
{recipeitem, recipeitem, recipeitem},
},
})
--===================================================== Outer ==
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_outer 7",
recipe = {
{modname .. ":micro_" .. subname, "", ""},
{recipeitem, modname .. ":micro_" .. subname, ""},
{recipeitem, recipeitem, modname .. ":micro_" .. subname},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_outer 7",
recipe = {
{"", "", modname .. ":micro_" .. subname},
{"", modname .. ":micro_" .. subname, recipeitem},
{modname .. ":micro_" .. subname, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_outer_half 10",
recipe = {
{modname .. ":micro_" .. subname, "", ""},
{recipeitem, recipeitem, modname .. ":micro_" .. subname},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_outer_half 10",
recipe = {
{"", "", modname .. ":micro_" .. subname},
{modname .. ":micro_" .. subname, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_outer_half_raised 7",
recipe = {
{modname .. ":micro_" .. subname, "", ""},
{recipeitem, recipeitem, modname .. ":micro_" .. subname},
{recipeitem, recipeitem, recipeitem},
},
})
minetest.register_craft({
output = modname .. ":slope_" .. subname .. "_outer_half_raised 7",
recipe = {
{"", "", modname .. ":micro_" .. subname},
{modname .. ":micro_" .. subname, recipeitem, recipeitem},
{recipeitem, recipeitem, recipeitem},
},
})
--================================================= Shapeless ==
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname, modname .. ":slope_" .. subname},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_cut", modname .. ":slope_" .. subname .. "_outer_cut"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
@ -402,12 +257,60 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer", modname .. ":slope_" .. subname .. "_inner"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_half", modname .. ":slope_" .. subname .. "_inner_half_raised"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_half_raised", modname .. ":slope_" .. subname .. "_inner_half"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_cut", modname .. ":slope_" .. subname .. "_inner_cut"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_outer_cut_half", modname .. ":slope_" .. subname .. "_inner_cut_half_raised"},
})
minetest.register_craft({
type = "shapeless",
output = recipeitem,
recipe = {modname .. ":slope_" .. subname .. "_cut", modname .. ":slope_" .. subname .. "_cut"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slope_" .. subname .. "_outer_half", modname .. ":slope_" .. subname .. "_inner_half"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slab_" .. subname,
recipe = {modname .. ":slope_" .. subname .. "_outer_cut_half", modname .. ":slope_" .. subname .. "_inner_cut_half"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_half_raised",
@ -435,25 +338,7 @@ function stairsplus:register_slope(modname, subname, recipeitem, fields)
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_outer_cut_half_raised",
recipe = {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_outer_cut_half"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_outer_cut",
recipe = {modname .. ":slope_" .. subname .. "_outer"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_outer_cut_half",
recipe = {modname .. ":slope_" .. subname .. "_outer_half"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":slope_" .. subname .. "_outer_cut_half_raised",
recipe = {modname .. ":slope_" .. subname .. "_outer_half_raised"},
output = modname .. ":slope_" .. subname .. "_inner_cut_half_raised",
recipe = {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_inner_cut_half"},
})
end

6
mods/moreblocks/stairsplus/stairs.lua
View File

@ -179,12 +179,6 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
recipe = {modname .. ":stair_" .. subname .. "_half"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":stair_" .. subname .. "_half",
recipe = {modname .. ":stair_" .. subname .. "_right_half"},
})
minetest.register_craft({
type = "shapeless",
output = modname .. ":stair_" .. subname,