From 54b2217aeb1ea98f7bffe258c6c7064a1a64f7dc Mon Sep 17 00:00:00 2001 From: Luke aka SwissalpS Date: Tue, 27 Feb 2024 20:24:51 +0100 Subject: [PATCH] Make circular saw and all cut nodes considered as non-ground content (#204) Default to not being ground content. The few nodes that were registered as ground content shouldn't be considered ground content. * cut nodes aren't ground content By default make cut nodes non ground content but allow mods to register theirs as ground content if they want to. --- circular_saw.lua | 1 + nodes.lua | 44 +------------------------------------------ stairsplus/common.lua | 1 + 3 files changed, 3 insertions(+), 43 deletions(-) diff --git a/circular_saw.lua b/circular_saw.lua index 4c5da34..02f58bd 100644 --- a/circular_saw.lua +++ b/circular_saw.lua @@ -447,6 +447,7 @@ minetest.register_node("moreblocks:circular_saw", { sunlight_propagates = true, paramtype2 = "facedir", groups = {choppy = 2,oddly_breakable_by_hand = 2}, + is_ground_content = false, sounds = moreblocks.node_sound_wood_defaults(), on_construct = circular_saw.on_construct, can_dig = circular_saw.can_dig, diff --git a/nodes.lua b/nodes.lua index 351ab6b..e41318b 100644 --- a/nodes.lua +++ b/nodes.lua @@ -41,7 +41,6 @@ local nodes = { ["wood_tile"] = { description = S("Wooden Tile"), groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, - is_ground_content = false, paramtype2 = "facedir", place_param2 = 0, tiles = {"default_wood.png^moreblocks_wood_tile.png", @@ -66,14 +65,12 @@ local nodes = { ["wood_tile_center"] = { description = S("Centered Wooden Tile"), 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"}, sounds = sound_wood, }, ["wood_tile_full"] = { description = S("Full Wooden Tile"), groups = {wood = 1, choppy = 2, oddly_breakable_by_hand = 2, flammable = 3}, - is_ground_content = false, tiles = tile_tiles("wood_tile_full"), sounds = sound_wood, }, @@ -82,7 +79,6 @@ local nodes = { paramtype2 = "facedir", place_param2 = 0, 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"}, sounds = sound_wood, no_stairs = true, @@ -108,7 +104,6 @@ local nodes = { ["circle_stone_bricks"] = { description = S("Circle Stone Bricks"), groups = {stone = 1, cracky = 3}, - is_ground_content = false, sounds = sound_stone, }, ["grey_bricks"] = { @@ -116,7 +111,6 @@ local nodes = { paramtype2 = "facedir", place_param2 = 0, groups = {cracky = 3}, - is_ground_content = false, sounds = sound_stone, }, ["coal_stone_bricks"] = { @@ -124,7 +118,6 @@ local nodes = { paramtype2 = "facedir", place_param2 = 0, groups = {stone = 1, cracky = 3}, - is_ground_content = false, sounds = sound_stone, }, ["iron_stone_bricks"] = { @@ -132,13 +125,11 @@ local nodes = { paramtype2 = "facedir", place_param2 = 0, groups = {stone = 1, cracky = 3}, - is_ground_content = false, sounds = sound_stone, }, ["stone_tile"] = { description = S("Stone Tile"), groups = {stone = 1, cracky = 3}, - is_ground_content = false, sounds = sound_stone, }, ["split_stone_tile"] = { @@ -148,37 +139,31 @@ local nodes = { tiles = {"moreblocks_split_stone_tile_top.png", "moreblocks_split_stone_tile.png"}, groups = {stone = 1, cracky = 3}, - is_ground_content = false, sounds = sound_stone, }, ["checker_stone_tile"] = { description = S("Checker Stone Tile"), groups = {stone = 1, cracky = 3}, - is_ground_content = false, sounds = sound_stone, }, ["tar"] = { description = S("Tar"), groups = {cracky=2, tar_block=1}, - is_ground_content = false, sounds = sound_stone, }, ["dirt_compressed"] = { description = S("Compressed Dirt"), groups = {crumbly=2, compressed = 1}, - is_ground_content = false, sounds = sound_dirt, }, ["cobble_compressed"] = { description = S("Compressed Cobblestone"), groups = {cracky = 1, compressed = 1}, - is_ground_content = false, sounds = sound_stone, }, ["desert_cobble_compressed"] = { description = S("Compressed Desert Cobblestone"), groups = {cracky = 1, compressed = 1}, - is_ground_content = false, sounds = sound_stone, }, ["plankstone"] = { @@ -186,7 +171,6 @@ local nodes = { paramtype2 = "facedir", place_param2 = 0, groups = {cracky = 3}, - is_ground_content = false, tiles = tile_tiles("plankstone"), sounds = sound_stone, }, @@ -197,7 +181,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, groups = {cracky = 3, oddly_breakable_by_hand = 3}, sounds = sound_glass, }, @@ -208,7 +191,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, groups = {cracky = 3, oddly_breakable_by_hand = 3}, sounds = sound_glass, }, @@ -219,7 +201,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, groups = {cracky = 3, oddly_breakable_by_hand = 3}, sounds = sound_glass, }, @@ -228,13 +209,11 @@ local nodes = { paramtype2 = "facedir", place_param2 = 0, groups = {cracky = 3}, - is_ground_content = false, sounds = sound_stone, }, ["cactus_checker"] = { description = S("Cactus Checker"), groups = {stone = 1, cracky = 3}, - is_ground_content = false, tiles = {"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", "default_wood.png", "moreblocks_empty_shelf.png", "moreblocks_empty_shelf.png"}, groups = {choppy = 3, oddly_breakable_by_hand = 2, flammable = 3}, - is_ground_content = false, sounds = sound_wood, furnace_burntime = 15, no_stairs = true, @@ -257,13 +235,11 @@ local nodes = { ["coal_stone"] = { description = S("Coal Stone"), groups = {stone = 1, cracky = 3}, - is_ground_content = false, sounds = sound_stone, }, ["iron_stone"] = { description = S("Iron Stone"), groups = {stone = 1, cracky = 3}, - is_ground_content = false, sounds = sound_stone, }, ["coal_checker"] = { @@ -275,7 +251,6 @@ local nodes = { "default_stone.png^moreblocks_coal_checker.png^[transformR90", "default_stone.png^moreblocks_coal_checker.png^[transformR90"}, groups = {stone = 1, cracky = 3}, - is_ground_content = false, sounds = sound_stone, }, ["iron_checker"] = { @@ -287,7 +262,6 @@ local nodes = { "default_stone.png^moreblocks_iron_checker.png^[transformR90", "default_stone.png^moreblocks_iron_checker.png^[transformR90"}, groups = {stone = 1, cracky = 3}, - is_ground_content = false, sounds = sound_stone, }, ["trap_stone"] = { @@ -297,7 +271,6 @@ local nodes = { walkable = false, groups = {cracky = 3}, paramtype = "light", - is_ground_content = false, sounds = sound_stone, no_stairs = true, }, @@ -308,7 +281,6 @@ local nodes = { walkable = false, groups = {cracky = 3}, paramtype = "light", - is_ground_content = false, sounds = sound_stone, no_stairs = true, }, @@ -319,7 +291,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, walkable = false, groups = {cracky = 3, oddly_breakable_by_hand = 3}, sounds = sound_glass, @@ -332,7 +303,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, walkable = false, groups = {cracky = 3, oddly_breakable_by_hand = 3}, sounds = sound_glass, @@ -345,7 +315,6 @@ local nodes = { walkable = false, groups = {cracky = 1, level = 2}, paramtype = "light", - is_ground_content = false, sounds = sound_stone, no_stairs = true, }, @@ -356,7 +325,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, walkable = false, groups = {cracky = 3, oddly_breakable_by_hand = 3}, sounds = sound_glass, @@ -369,7 +337,6 @@ local nodes = { walkable = false, groups = {crumbly = 1, cracky = 3}, paramtype = "light", - is_ground_content = false, sounds = sound_stone, no_stairs = true, }, @@ -415,7 +382,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, light_source = 11, groups = {cracky = 3, oddly_breakable_by_hand = 3}, sounds = sound_glass, @@ -427,7 +393,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, light_source = 11, groups = {cracky = 3, oddly_breakable_by_hand = 3}, sounds = sound_glass, @@ -439,7 +404,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, light_source = 11, walkable = false, groups = {cracky = 3, oddly_breakable_by_hand = 3}, @@ -453,7 +417,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, light_source = 11, walkable = false, groups = {cracky = 3, oddly_breakable_by_hand = 3}, @@ -467,7 +430,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, light_source = default.LIGHT_MAX, groups = {cracky = 3, oddly_breakable_by_hand = 3}, sounds = sound_glass, @@ -479,7 +441,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, light_source = default.LIGHT_MAX, groups = {cracky = 3, oddly_breakable_by_hand = 3}, sounds = sound_glass, @@ -491,7 +452,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, light_source = default.LIGHT_MAX, walkable = false, groups = {cracky = 3, oddly_breakable_by_hand = 3}, @@ -505,7 +465,6 @@ local nodes = { use_texture_alpha = "clip", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, light_source = default.LIGHT_MAX, walkable = false, groups = {cracky = 3, oddly_breakable_by_hand = 3}, @@ -519,7 +478,6 @@ local nodes = { wield_image = "moreblocks_rope.png", paramtype = "light", sunlight_propagates = true, - is_ground_content = false, paramtype2 = "wallmounted", walkable = false, climbable = true, @@ -531,12 +489,12 @@ local nodes = { ["copperpatina"] = { description = S("Copper Patina Block"), groups = {cracky = 1, level = 2}, - is_ground_content = false, sounds = sound_metal, }, } for name, def in pairs(nodes) do + def.is_ground_content = def.is_ground_content == true def.tiles = def.tiles or {"moreblocks_" ..name.. ".png"} minetest.register_node("moreblocks:" ..name, def) minetest.register_alias(name, "moreblocks:" ..name) diff --git a/stairsplus/common.lua b/stairsplus/common.lua index aee1e6a..26d4031 100644 --- a/stairsplus/common.lua +++ b/stairsplus/common.lua @@ -133,6 +133,7 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam def[k] = v end + def.is_ground_content = def.is_ground_content == true def.drawtype = "nodebox" def.paramtype = "light" def.paramtype2 = def.paramtype2 or "facedir"