nalc/moreblocks
1
0
Fork 0
forked from minetest-mods/moreblocks
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
bri cassa 2024-09-15 09:27:52 +02:00
commit 4df0dd5964
3 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
circular_saw.lua
View File

@ -447,6 +447,7 @@ minetest.register_node("moreblocks:circular_saw", {
sunlight_propagates = true, sunlight_propagates = true,
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {choppy = 2,oddly_breakable_by_hand = 2}, groups = {choppy = 2,oddly_breakable_by_hand = 2},
is_ground_content = false,
sounds = moreblocks.node_sound_wood_defaults(), sounds = moreblocks.node_sound_wood_defaults(),
on_construct = circular_saw.on_construct, on_construct = circular_saw.on_construct,
can_dig = circular_saw.can_dig, can_dig = circular_saw.can_dig,

44
nodes.lua
View File

@ -41,7 +41,6 @@ local nodes = {
["wood_tile"] = { ["wood_tile"] = {
description = S("Wooden Tile"), description = S("Wooden Tile"),
groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
is_ground_content = false,
paramtype2 = "facedir", paramtype2 = "facedir",
place_param2 = 0, place_param2 = 0,
tiles = {"default_wood.png^moreblocks_wood_tile.png", tiles = {"default_wood.png^moreblocks_wood_tile.png",
@ -66,14 +65,12 @@ local nodes = {
["wood_tile_center"] = { ["wood_tile_center"] = {
description = S("Centered Wooden Tile"), description = S("Centered Wooden Tile"),
groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
is_ground_content = false,
tiles = {"default_wood.png^moreblocks_wood_tile_center.png"}, tiles = {"default_wood.png^moreblocks_wood_tile_center.png"},
sounds = sound_wood, sounds = sound_wood,
}, },
["wood_tile_full"] = { ["wood_tile_full"] = {
description = S("Full Wooden Tile"), description = S("Full Wooden Tile"),
groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
is_ground_content = false,
tiles = tile_tiles("wood_tile_full"), tiles = tile_tiles("wood_tile_full"),
sounds = sound_wood, sounds = sound_wood,
}, },
@ -82,7 +79,6 @@ local nodes = {
paramtype2 = "facedir", paramtype2 = "facedir",
place_param2 = 0, place_param2 = 0,
groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3},
is_ground_content = false,
tiles = {"default_wood.png^moreblocks_wood_tile_offset.png"}, tiles = {"default_wood.png^moreblocks_wood_tile_offset.png"},
sounds = sound_wood, sounds = sound_wood,
no_stairs = true, no_stairs = true,
@ -108,7 +104,6 @@ local nodes = {
["circle_stone_bricks"] = { ["circle_stone_bricks"] = {
description = S("Circle Stone Bricks"), description = S("Circle Stone Bricks"),
groups = {stone = 1, cracky = 3}, groups = {stone = 1, cracky = 3},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["grey_bricks"] = { ["grey_bricks"] = {
@ -116,7 +111,6 @@ local nodes = {
paramtype2 = "facedir", paramtype2 = "facedir",
place_param2 = 0, place_param2 = 0,
groups = {cracky = 3}, groups = {cracky = 3},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["coal_stone_bricks"] = { ["coal_stone_bricks"] = {
@ -124,7 +118,6 @@ local nodes = {
paramtype2 = "facedir", paramtype2 = "facedir",
place_param2 = 0, place_param2 = 0,
groups = {stone = 1, cracky = 3}, groups = {stone = 1, cracky = 3},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["iron_stone_bricks"] = { ["iron_stone_bricks"] = {
@ -132,13 +125,11 @@ local nodes = {
paramtype2 = "facedir", paramtype2 = "facedir",
place_param2 = 0, place_param2 = 0,
groups = {stone = 1, cracky = 3}, groups = {stone = 1, cracky = 3},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["stone_tile"] = { ["stone_tile"] = {
description = S("Stone Tile"), description = S("Stone Tile"),
groups = {stone = 1, cracky = 3}, groups = {stone = 1, cracky = 3},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["split_stone_tile"] = { ["split_stone_tile"] = {
@ -148,37 +139,31 @@ local nodes = {
tiles = {"moreblocks_split_stone_tile_top.png", tiles = {"moreblocks_split_stone_tile_top.png",
"moreblocks_split_stone_tile.png"}, "moreblocks_split_stone_tile.png"},
groups = {stone = 1, cracky = 3}, groups = {stone = 1, cracky = 3},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["checker_stone_tile"] = { ["checker_stone_tile"] = {
description = S("Checker Stone Tile"), description = S("Checker Stone Tile"),
groups = {stone = 1, cracky = 3}, groups = {stone = 1, cracky = 3},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["tar"] = { ["tar"] = {
description = S("Tar"), description = S("Tar"),
groups = {cracky=2, tar_block=1}, groups = {cracky=2, tar_block=1},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["dirt_compressed"] = { ["dirt_compressed"] = {
description = S("Compressed Dirt"), description = S("Compressed Dirt"),
groups = {crumbly=2, compressed = 1}, groups = {crumbly=2, compressed = 1},
is_ground_content = false,
sounds = sound_dirt, sounds = sound_dirt,
}, },
["cobble_compressed"] = { ["cobble_compressed"] = {
description = S("Compressed Cobblestone"), description = S("Compressed Cobblestone"),
groups = {cracky = 1, compressed = 1}, groups = {cracky = 1, compressed = 1},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["desert_cobble_compressed"] = { ["desert_cobble_compressed"] = {
description = S("Compressed Desert Cobblestone"), description = S("Compressed Desert Cobblestone"),
groups = {cracky = 1, compressed = 1}, groups = {cracky = 1, compressed = 1},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["plankstone"] = { ["plankstone"] = {
@ -186,7 +171,6 @@ local nodes = {
paramtype2 = "facedir", paramtype2 = "facedir",
place_param2 = 0, place_param2 = 0,
groups = {cracky = 3}, groups = {cracky = 3},
is_ground_content = false,
tiles = tile_tiles("plankstone"), tiles = tile_tiles("plankstone"),
sounds = sound_stone, sounds = sound_stone,
}, },
@ -197,7 +181,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
sounds = sound_glass, sounds = sound_glass,
}, },
@ -208,7 +191,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
sounds = sound_glass, sounds = sound_glass,
}, },
@ -219,7 +201,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
sounds = sound_glass, sounds = sound_glass,
}, },
@ -228,13 +209,11 @@ local nodes = {
paramtype2 = "facedir", paramtype2 = "facedir",
place_param2 = 0, place_param2 = 0,
groups = {cracky = 3}, groups = {cracky = 3},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["cactus_checker"] = { ["cactus_checker"] = {
description = S("Cactus Checker"), description = S("Cactus Checker"),
groups = {stone = 1, cracky = 3}, groups = {stone = 1, cracky = 3},
is_ground_content = false,
tiles = {"default_stone.png^moreblocks_cactus_checker.png", tiles = {"default_stone.png^moreblocks_cactus_checker.png",
"default_stone.png^moreblocks_cactus_checker.png", "default_stone.png^moreblocks_cactus_checker.png",
"default_stone.png^moreblocks_cactus_checker.png", "default_stone.png^moreblocks_cactus_checker.png",
@ -249,7 +228,6 @@ local nodes = {
tiles = {"default_wood.png", "default_wood.png", "default_wood.png", tiles = {"default_wood.png", "default_wood.png", "default_wood.png",
"default_wood.png", "moreblocks_empty_shelf.png", "moreblocks_empty_shelf.png"}, "default_wood.png", "moreblocks_empty_shelf.png", "moreblocks_empty_shelf.png"},
groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3}, groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3},
is_ground_content = false,
sounds = sound_wood, sounds = sound_wood,
furnace_burntime = 15, furnace_burntime = 15,
no_stairs = true, no_stairs = true,
@ -257,13 +235,11 @@ local nodes = {
["coal_stone"] = { ["coal_stone"] = {
description = S("Coal Stone"), description = S("Coal Stone"),
groups = {stone = 1, cracky = 3}, groups = {stone = 1, cracky = 3},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["iron_stone"] = { ["iron_stone"] = {
description = S("Iron Stone"), description = S("Iron Stone"),
groups = {stone = 1, cracky = 3}, groups = {stone = 1, cracky = 3},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["coal_checker"] = { ["coal_checker"] = {
@ -275,7 +251,6 @@ local nodes = {
"default_stone.png^moreblocks_coal_checker.png^[transformR90", "default_stone.png^moreblocks_coal_checker.png^[transformR90",
"default_stone.png^moreblocks_coal_checker.png^[transformR90"}, "default_stone.png^moreblocks_coal_checker.png^[transformR90"},
groups = {stone = 1, cracky = 3}, groups = {stone = 1, cracky = 3},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["iron_checker"] = { ["iron_checker"] = {
@ -287,7 +262,6 @@ local nodes = {
"default_stone.png^moreblocks_iron_checker.png^[transformR90", "default_stone.png^moreblocks_iron_checker.png^[transformR90",
"default_stone.png^moreblocks_iron_checker.png^[transformR90"}, "default_stone.png^moreblocks_iron_checker.png^[transformR90"},
groups = {stone = 1, cracky = 3}, groups = {stone = 1, cracky = 3},
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
}, },
["trap_stone"] = { ["trap_stone"] = {
@ -297,7 +271,6 @@ local nodes = {
walkable = false, walkable = false,
groups = {cracky = 3}, groups = {cracky = 3},
paramtype = "light", paramtype = "light",
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
no_stairs = true, no_stairs = true,
}, },
@ -308,7 +281,6 @@ local nodes = {
walkable = false, walkable = false,
groups = {cracky = 3}, groups = {cracky = 3},
paramtype = "light", paramtype = "light",
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
no_stairs = true, no_stairs = true,
}, },
@ -319,7 +291,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
walkable = false, walkable = false,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
sounds = sound_glass, sounds = sound_glass,
@ -332,7 +303,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
walkable = false, walkable = false,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
sounds = sound_glass, sounds = sound_glass,
@ -345,7 +315,6 @@ local nodes = {
walkable = false, walkable = false,
groups = {cracky = 1, level = 2}, groups = {cracky = 1, level = 2},
paramtype = "light", paramtype = "light",
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
no_stairs = true, no_stairs = true,
}, },
@ -356,7 +325,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
walkable = false, walkable = false,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
sounds = sound_glass, sounds = sound_glass,
@ -369,7 +337,6 @@ local nodes = {
walkable = false, walkable = false,
groups = {crumbly = 1, cracky = 3}, groups = {crumbly = 1, cracky = 3},
paramtype = "light", paramtype = "light",
is_ground_content = false,
sounds = sound_stone, sounds = sound_stone,
no_stairs = true, no_stairs = true,
}, },
@ -415,7 +382,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
light_source = 11, light_source = 11,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
sounds = sound_glass, sounds = sound_glass,
@ -427,7 +393,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
light_source = 11, light_source = 11,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
sounds = sound_glass, sounds = sound_glass,
@ -439,7 +404,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
light_source = 11, light_source = 11,
walkable = false, walkable = false,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
@ -453,7 +417,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
light_source = 11, light_source = 11,
walkable = false, walkable = false,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
@ -467,7 +430,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
light_source = default.LIGHT_MAX, light_source = default.LIGHT_MAX,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
sounds = sound_glass, sounds = sound_glass,
@ -479,7 +441,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
light_source = default.LIGHT_MAX, light_source = default.LIGHT_MAX,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
sounds = sound_glass, sounds = sound_glass,
@ -491,7 +452,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
light_source = default.LIGHT_MAX, light_source = default.LIGHT_MAX,
walkable = false, walkable = false,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
@ -505,7 +465,6 @@ local nodes = {
use_texture_alpha = "clip", use_texture_alpha = "clip",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
light_source = default.LIGHT_MAX, light_source = default.LIGHT_MAX,
walkable = false, walkable = false,
groups = {cracky = 3, oddly_breakable_by_hand = 3}, groups = {cracky = 3, oddly_breakable_by_hand = 3},
@ -519,7 +478,6 @@ local nodes = {
wield_image = "moreblocks_rope.png", wield_image = "moreblocks_rope.png",
paramtype = "light", paramtype = "light",
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false,
paramtype2 = "wallmounted", paramtype2 = "wallmounted",
walkable = false, walkable = false,
climbable = true, climbable = true,
@ -531,12 +489,12 @@ local nodes = {
["copperpatina"] = { ["copperpatina"] = {
description = S("Copper Patina Block"), description = S("Copper Patina Block"),
groups = {cracky = 1, level = 2}, groups = {cracky = 1, level = 2},
is_ground_content = false,
sounds = sound_metal, sounds = sound_metal,
}, },
} }
for name, def in pairs(nodes) do for name, def in pairs(nodes) do
def.is_ground_content = def.is_ground_content == true
def.tiles = def.tiles or {"moreblocks_" ..name.. ".png"} def.tiles = def.tiles or {"moreblocks_" ..name.. ".png"}
minetest.register_node("moreblocks:" ..name, def) minetest.register_node("moreblocks:" ..name, def)
minetest.register_alias(name, "moreblocks:" ..name) minetest.register_alias(name, "moreblocks:" ..name)

1
stairsplus/common.lua
View File

@ -136,6 +136,7 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam
def[k] = v def[k] = v
end end
def.is_ground_content = def.is_ground_content == true
def.drawtype = "nodebox" def.drawtype = "nodebox"
def.paramtype = "light" def.paramtype = "light"
def.paramtype2 = def.paramtype2 or "facedir" def.paramtype2 = def.paramtype2 or "facedir"