From 549f541877140a113e6b2018069b6381f97e75e4 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 11 Mar 2017 05:34:58 +0100 Subject: [PATCH] Add 4 Minecraft material groups So they can be used by the noteblock --- GROUPS.md | 12 +++ mods/ENTITIES/mobs/spawner.lua | 2 +- mods/HUD/mcl_inventory/init.lua | 2 +- mods/ITEMS/REDSTONE/mcl_dispensers/init.lua | 4 +- mods/ITEMS/REDSTONE/mcl_droppers/init.lua | 4 +- .../REDSTONE/mesecons_noteblock/init.lua | 2 +- .../REDSTONE/mesecons_pressureplates/init.lua | 4 +- .../REDSTONE/mesecons_solarpanel/init.lua | 8 +- mods/ITEMS/doors/init.lua | 14 +-- mods/ITEMS/mcl_books/init.lua | 2 +- mods/ITEMS/mcl_chests/init.lua | 8 +- mods/ITEMS/mcl_colorblocks/init.lua | 10 +- mods/ITEMS/mcl_core/functions.lua | 2 +- mods/ITEMS/mcl_core/nodes.lua | 94 +++++++++---------- mods/ITEMS/mcl_end/init.lua | 18 ++-- mods/ITEMS/mcl_furnaces/init.lua | 4 +- mods/ITEMS/mcl_jukebox/init.lua | 2 +- mods/ITEMS/mcl_mushrooms/huge.lua | 2 +- mods/ITEMS/mcl_nether/init.lua | 20 ++-- mods/ITEMS/mcl_ocean/init.lua | 8 +- mods/ITEMS/signs/init.lua | 2 +- mods/ITEMS/stairs/init.lua | 48 +++++----- mods/ITEMS/xpanes/init.lua | 2 +- 23 files changed, 143 insertions(+), 131 deletions(-) diff --git a/GROUPS.md b/GROUPS.md index 99ea6823..077c42bf 100644 --- a/GROUPS.md +++ b/GROUPS.md @@ -64,6 +64,18 @@ Please read to learn how digging times * `carpet=1:` (Wool) carpet * `stick=1`: Stick +### Material groups + +These groups correspond to the Minecraft materials. They classify the block into a type, indicating what the block is “made off”. + +* `material_stone=1`: Stone +* `material_wood=1`: Wood +* `material_sand=1`: Sand +* `material_glass=1`: Glass + +Currently, these groups are used for the note block. +Note that not all Minecraft materials are used so far. More Minecraft materials will lilely only be added when they are needed for a concrete use case. + ### Declarative groups These groups are used mostly for informational purposes diff --git a/mods/ENTITIES/mobs/spawner.lua b/mods/ENTITIES/mobs/spawner.lua index 9f4bce72..51522f81 100644 --- a/mods/ENTITIES/mobs/spawner.lua +++ b/mods/ENTITIES/mobs/spawner.lua @@ -11,7 +11,7 @@ minetest.register_node("mobs:spawner", { paramtype = "light", walkable = true, description = S("Monster Spawner"), - groups = {pickaxey=1, not_in_creative_inventory = 1}, + groups = {pickaxey=1, not_in_creative_inventory = 1, material_stone=1}, drop = "", on_construct = function(pos) diff --git a/mods/HUD/mcl_inventory/init.lua b/mods/HUD/mcl_inventory/init.lua index 77379a97..b0cb7665 100644 --- a/mods/HUD/mcl_inventory/init.lua +++ b/mods/HUD/mcl_inventory/init.lua @@ -187,7 +187,7 @@ minetest.register_node("mcl_inventory:workbench", { "crafting_workbench_side.png", "crafting_workbench_front.png", "crafting_workbench_front.png"}, paramtype2 = "facedir", paramtype = "light", - groups = {handy=1,axey=1, deco_block=1}, + groups = {handy=1,axey=1, deco_block=1, material_wood=1}, on_rightclick = function(pos, node, clicker, itemstack) set_workbench(clicker) end, diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua index 3dc20736..1b4c8c32 100644 --- a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua +++ b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua @@ -378,7 +378,7 @@ horizontal_def.tiles = { "default_furnace_side.png", "mcl_dispensers_dispenser_front_horizontal.png" } horizontal_def.paramtype2 = "facedir" -horizontal_def.groups = {pickaxey=1, container=2} +horizontal_def.groups = {pickaxey=1, container=2, material_stone=1} minetest.register_node("mcl_dispensers:dispenser", horizontal_def) @@ -391,7 +391,7 @@ down_def.tiles = { "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png" } -down_def.groups = {pickaxey=1, container=2,not_in_creative_inventory=1} +down_def.groups = {pickaxey=1, container=2,not_in_creative_inventory=1, material_stone=1} down_def._doc_items_create_entry = false down_def.drop = "mcl_dispensers:dispenser" minetest.register_node("mcl_dispensers:dispenser_down", down_def) diff --git a/mods/ITEMS/REDSTONE/mcl_droppers/init.lua b/mods/ITEMS/REDSTONE/mcl_droppers/init.lua index 19ff8c0a..e6827e6a 100644 --- a/mods/ITEMS/REDSTONE/mcl_droppers/init.lua +++ b/mods/ITEMS/REDSTONE/mcl_droppers/init.lua @@ -116,7 +116,7 @@ horizontal_def.tiles = { "default_furnace_side.png", "mcl_droppers_dropper_front_horizontal.png" } horizontal_def.paramtype2 = "facedir" -horizontal_def.groups = {pickaxey=1, container=2} +horizontal_def.groups = {pickaxey=1, container=2, material_stone=1} minetest.register_node("mcl_droppers:dropper", horizontal_def) @@ -129,7 +129,7 @@ down_def.tiles = { "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png", "default_furnace_side.png" } -down_def.groups = {pickaxey=1, container=2,not_in_creative_inventory=1} +down_def.groups = {pickaxey=1, container=2,not_in_creative_inventory=1, material_stone=1} down_def._doc_items_create_entry = false down_def.drop = "mcl_droppers:dropper" minetest.register_node("mcl_droppers:dropper_down", down_def) diff --git a/mods/ITEMS/REDSTONE/mesecons_noteblock/init.lua b/mods/ITEMS/REDSTONE/mesecons_noteblock/init.lua index d00dec01..d4f4dc19 100644 --- a/mods/ITEMS/REDSTONE/mesecons_noteblock/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_noteblock/init.lua @@ -1,7 +1,7 @@ minetest.register_node("mesecons_noteblock:noteblock", { description = "Note Block", tiles = {"mesecons_noteblock.png"}, - groups = {handy=1,axey=1}, + groups = {handy=1,axey=1, material_wood=1}, drawtype = "allfaces_optional", visual_scale = 1.3, paramtype="light", diff --git a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua index a61304dc..06648b52 100644 --- a/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_pressureplates/init.lua @@ -132,7 +132,7 @@ mesecon:register_pressure_plate( "default_wood.png", {{"group:wood", "group:wood"}}, mcl_sounds.node_sound_wood_defaults(), - {axey=1}) + {axey=1, material_wood=1}) mesecon:register_pressure_plate( "mesecons_pressureplates:pressure_plate_stone_off", @@ -142,7 +142,7 @@ mesecon:register_pressure_plate( "default_stone.png", {{"mcl_core:stone", "mcl_core:stone"}}, mcl_sounds.node_sound_stone_defaults(), - {pickaxey=1}) + {pickaxey=1, material_stone=1}) minetest.register_craft({ type = "fuel", diff --git a/mods/ITEMS/REDSTONE/mesecons_solarpanel/init.lua b/mods/ITEMS/REDSTONE/mesecons_solarpanel/init.lua index 7c4cb9f2..e2c6b242 100644 --- a/mods/ITEMS/REDSTONE/mesecons_solarpanel/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_solarpanel/init.lua @@ -20,7 +20,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_on", { drop = "mesecons_solarpanel:solar_panel_off", description="Daylight Sensor", _doc_items_create_entry = false, - groups = {dig_immediate=3, not_in_creative_inventory = 1}, + groups = {dig_immediate=3, not_in_creative_inventory = 1, material_wood=1}, sounds = mcl_sounds.node_sound_glass_defaults(), mesecons = {receptor = { state = mesecon.state.on @@ -49,7 +49,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_off", { type = "fixed", fixed = boxes }, - groups = {dig_immediate=3}, + groups = {dig_immediate=3, material_wood=1}, description="Daylight Sensor", _doc_items_longdesc = "Daylight sensors are redstone components which provide redstone power when they are in sunlight and no power otherwise. They can also be inverted.", _doc_items_usagehelp = "Rightclick the daylight sensor to turn it into an inverted daylight sensor, which supplies redstone energy when it is in moonlight.", @@ -123,7 +123,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_inverted_on", { fixed = boxes }, drop = "mesecons_solarpanel:solar_panel_off", - groups = {dig_immediate=3, not_in_creative_inventory = 1}, + groups = {dig_immediate=3, not_in_creative_inventory = 1, material_wood=1}, description="Inverted Daylight Sensor", _doc_items_create_entry = false, sounds = mcl_sounds.node_sound_glass_defaults(), @@ -155,7 +155,7 @@ minetest.register_node("mesecons_solarpanel:solar_panel_inverted_off", { fixed = boxes }, drop = "mesecons_solarpanel:solar_panel_off", - groups = {dig_immediate=3, not_in_creative_inventory=1}, + groups = {dig_immediate=3, not_in_creative_inventory=1, material_wood=1}, description="Inverted Daylight Sensor", _doc_items_longdesc = "An inverted daylight sensor is a variant of the daylight sensor. It is a redstone component which provides redstone power when it in moonlight and no power otherwise. It can turned back into an ordinary daylight sensor.", _doc_items_usagehelp = "Rightclick the daylight sensor to turn it into a daylight sensor.", diff --git a/mods/ITEMS/doors/init.lua b/mods/ITEMS/doors/init.lua index 8600406c..6d436d5e 100644 --- a/mods/ITEMS/doors/init.lua +++ b/mods/ITEMS/doors/init.lua @@ -316,7 +316,7 @@ end doors:register_door("doors:door_wood", { description = "Oak Door", inventory_image = "door_wood.png", - groups = {handy=1,axey=1, door=1}, + groups = {handy=1,axey=1, door=1, material_wood=1}, _mcl_hardness = 3, tiles_bottom = {"door_wood_b.png", "door_brown.png"}, tiles_top = {"door_wood_a.png", "door_brown.png"}, @@ -336,7 +336,7 @@ minetest.register_craft({ doors:register_door("doors:door_acacia", { description = "Acacia Door", inventory_image = "door_acacia.png", - groups = {handy=1,axey=1, door=1}, + groups = {handy=1,axey=1, door=1, material_wood=1}, _mcl_hardness = 3, tiles_bottom = {"door_acacia_b.png", "door_brown.png"}, tiles_top = {"door_acacia_a.png", "door_brown.png"}, @@ -356,7 +356,7 @@ minetest.register_craft({ doors:register_door("doors:door_birch", { description = "Birch Door", inventory_image = "door_birch.png", - groups = {handy=1,axey=1, door=1}, + groups = {handy=1,axey=1, door=1, material_wood=1}, _mcl_hardness = 3, tiles_bottom = {"door_birch_b.png", "door_brown.png"}, tiles_top = {"door_birch_a.png", "door_brown.png"}, @@ -376,7 +376,7 @@ minetest.register_craft({ doors:register_door("doors:door_dark_oak", { description = "Dark Oak Door", inventory_image = "door_dark_oak.png", - groups = {handy=1,axey=1, door=1}, + groups = {handy=1,axey=1, door=1, material_wood=1}, _mcl_hardness = 3, tiles_bottom = {"door_dark_oak_b.png", "door_brown.png"}, tiles_top = {"door_dark_oak_a.png", "door_brown.png"}, @@ -396,7 +396,7 @@ minetest.register_craft({ doors:register_door("doors:door_jungle", { description = "Jungle Door", inventory_image = "door_jungle.png", - groups = {handy=1,axey=1, door=1}, + groups = {handy=1,axey=1, door=1, material_wood=1}, _mcl_hardness = 3, tiles_bottom = {"door_jungle_b.png", "door_brown.png"}, tiles_top = {"door_jungle_a.png", "door_brown.png"}, @@ -416,7 +416,7 @@ minetest.register_craft({ doors:register_door("doors:door_spruce", { description = "Spruce Door", inventory_image = "door_spruce.png", - groups = {handy=1,axey=1, door=1}, + groups = {handy=1,axey=1, door=1, material_wood=1}, _mcl_hardness = 3, tiles_bottom = {"door_spruce_b.png", "door_brown.png"}, tiles_top = {"door_spruce_a.png", "door_brown.png"}, @@ -596,7 +596,7 @@ doors:register_trapdoor("doors:trapdoor", { description = "Wooden Trapdoor", tiles = {"door_trapdoor.png"}, wield_image = "door_trapdoor.png", - groups = {handy=1,axey=1, mesecon_effector_on=1,door=2}, + groups = {handy=1,axey=1, mesecon_effector_on=1,door=2, material_wood=1}, _mcl_hardness = 3, sounds = mcl_sounds.node_sound_wood_defaults(), }) diff --git a/mods/ITEMS/mcl_books/init.lua b/mods/ITEMS/mcl_books/init.lua index 50d9a4a1..a7fb27c3 100644 --- a/mods/ITEMS/mcl_books/init.lua +++ b/mods/ITEMS/mcl_books/init.lua @@ -179,7 +179,7 @@ minetest.register_node("mcl_books:bookshelf", { tiles = {"default_wood.png", "default_wood.png", "default_bookshelf.png"}, stack_max = 64, is_ground_content = false, - groups = {handy=1,axey=1, flammable=3,building_block=1}, + groups = {handy=1,axey=1, flammable=3,building_block=1, material_wood=1}, drop = "mcl_books:book 3", sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 7.5, diff --git a/mods/ITEMS/mcl_chests/init.lua b/mods/ITEMS/mcl_chests/init.lua index 082de14f..c4b25139 100644 --- a/mods/ITEMS/mcl_chests/init.lua +++ b/mods/ITEMS/mcl_chests/init.lua @@ -30,7 +30,7 @@ minetest.register_node("mcl_chests:chest", { "default_chest_side.png", "default_chest_side.png", "default_chest_front.png"}, paramtype2 = "facedir", stack_max = 64, - groups = {handy=1,axey=1, container=2, deco_block=1}, + groups = {handy=1,axey=1, container=2, deco_block=1, material_wood=1}, is_ground_content = false, sounds = mcl_sounds.node_sound_wood_defaults(), on_construct = function(pos) @@ -148,7 +148,7 @@ minetest.register_node("mcl_chests:chest_left", { tiles = {"default_chest_top_big.png", "default_chest_top_big.png", "default_chest_side.png", "default_chest_side.png", "default_chest_side_big.png^[transformFX", "default_chest_front_big.png"}, paramtype2 = "facedir", - groups = {handy=1,axey=1, container=2,not_in_creative_inventory=1}, + groups = {handy=1,axey=1, container=2,not_in_creative_inventory=1, material_wood=1}, drop = "mcl_chests:chest", is_ground_content = false, sounds = mcl_sounds.node_sound_wood_defaults(), @@ -209,7 +209,7 @@ minetest.register_node("mcl_chests:chest_right", { tiles = {"default_chest_top_big.png^[transformFX", "default_chest_top_big.png^[transformFX", "default_chest_side.png", "default_chest_side.png", "default_chest_side_big.png", "default_chest_front_big.png^[transformFX"}, paramtype2 = "facedir", - groups = {handy=1,axey=1, container=2,not_in_creative_inventory=1}, + groups = {handy=1,axey=1, container=2,not_in_creative_inventory=1, material_wood=1}, drop = "mcl_chests:chest", is_ground_content = false, sounds = mcl_sounds.node_sound_wood_defaults(), @@ -290,7 +290,7 @@ minetest.register_node("mcl_chests:ender_chest", { "mcl_chests_ender_chest_back.png", "mcl_chests_ender_chest_front.png"}, -- Note: The “container” group is missing here because the ender chest does not -- have an inventory on its own - groups = {pickaxey=1, deco_block=1}, + groups = {pickaxey=1, deco_block=1, material_stone=1}, is_ground_content = false, paramtype = "light", light_source = 7, diff --git a/mods/ITEMS/mcl_colorblocks/init.lua b/mods/ITEMS/mcl_colorblocks/init.lua index c983b11a..dbe2d838 100644 --- a/mods/ITEMS/mcl_colorblocks/init.lua +++ b/mods/ITEMS/mcl_colorblocks/init.lua @@ -31,7 +31,7 @@ minetest.register_node("mcl_colorblocks:hardened_clay", { _doc_items_longdesc = "Hardened clay is natural to deserts and a basic building material.", tiles = {"hardened_clay.png"}, stack_max = 64, - groups = {pickaxey=1, hardened_clay=1,building_block=1}, + groups = {pickaxey=1, hardened_clay=1,building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 21, _mcl_hardness = 1.25, @@ -56,7 +56,7 @@ for _, row in ipairs(block.dyes) do description = desc.." Hardened Clay", _doc_items_longdesc = hc_desc, tiles = {"hardened_clay_stained_"..name..".png"}, - groups = {pickaxey=1, hardened_clay=1,building_block=1}, + groups = {pickaxey=1, hardened_clay=1,building_block=1, material_stone=1}, stack_max = 64, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 21, @@ -67,7 +67,7 @@ for _, row in ipairs(block.dyes) do description = desc.." Concrete Powder", _doc_items_longdesc = cp_desc, tiles = {"mcl_colorblocks_concrete_powder_"..name..".png"}, - groups = {handy=1,shovely=1, concrete_powder=1,building_block=1,falling_node=1}, + groups = {handy=1,shovely=1, concrete_powder=1,building_block=1,falling_node=1, material_sand=1}, stack_max = 64, is_ground_content = false, sounds = mcl_sounds.node_sound_sand_defaults(), @@ -82,7 +82,7 @@ for _, row in ipairs(block.dyes) do description = desc.." Concrete", _doc_items_longdesc = conc_desc, tiles = {"mcl_colorblocks_concrete_"..name..".png"}, - groups = {handy=1,pickaxey=1, concrete=1,building_block=1}, + groups = {handy=1,pickaxey=1, concrete=1,building_block=1, material_stone=1}, stack_max = 64, is_ground_content = false, sounds = mcl_sounds.node_sound_stone_defaults(), @@ -97,7 +97,7 @@ for _, row in ipairs(block.dyes) do description = desc.." Glazed Terracotta", _doc_items_longdesc = gt_desc, tiles = texes, - groups = {handy=1,pickaxey=1, glazed_terracotta=1,building_block=1}, + groups = {handy=1,pickaxey=1, glazed_terracotta=1,building_block=1, material_stone=1}, paramtype2 = "facedir", stack_max = 64, is_ground_content = false, diff --git a/mods/ITEMS/mcl_core/functions.lua b/mods/ITEMS/mcl_core/functions.lua index 22d1dc2e..8cca41db 100644 --- a/mods/ITEMS/mcl_core/functions.lua +++ b/mods/ITEMS/mcl_core/functions.lua @@ -618,7 +618,7 @@ function mcl_core.add_glass(desc, recipeitem, color) paramtype = "light", use_texture_alpha = true, stack_max = 64, - groups = {handy=1, glass=1, building_block=1}, + groups = {handy=1, glass=1, building_block=1, material_glass=1}, sounds = mcl_sounds.node_sound_glass_defaults(), drop = "", _mcl_blast_resistance = 1.5, diff --git a/mods/ITEMS/mcl_core/nodes.lua b/mods/ITEMS/mcl_core/nodes.lua index 0087d316..f6ff1efe 100644 --- a/mods/ITEMS/mcl_core/nodes.lua +++ b/mods/ITEMS/mcl_core/nodes.lua @@ -70,7 +70,7 @@ minetest.register_node("mcl_core:stone", { tiles = {"default_stone.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=1, stone=1, building_block=1, deco_block=1}, + groups = {pickaxey=1, stone=1, building_block=1, deco_block=1, material_stone=1}, drop = 'mcl_core:cobble', sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, @@ -83,7 +83,7 @@ minetest.register_node("mcl_core:stone_with_coal", { tiles = {"default_stone.png^default_mineral_coal.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, drop = 'mcl_core:coal_lump', sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 15, @@ -96,7 +96,7 @@ minetest.register_node("mcl_core:stone_with_iron", { tiles = {"default_stone.png^default_mineral_iron.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=3, building_block=1}, + groups = {pickaxey=3, building_block=1, material_stone=1}, drop = 'mcl_core:stone_with_iron', sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 15, @@ -110,7 +110,7 @@ minetest.register_node("mcl_core:stone_with_gold", { tiles = {"default_stone.png^default_mineral_gold.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=4, building_block=1}, + groups = {pickaxey=4, building_block=1, material_stone=1}, drop = "mcl_core:stone_with_gold", sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 15, @@ -129,7 +129,7 @@ minetest.register_node("mcl_core:stone_with_redstone", { tiles = {"default_stone.png^default_mineral_redstone.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=4, building_block=1}, + groups = {pickaxey=4, building_block=1, material_stone=1}, drop = { items = { max_items = 1, @@ -162,7 +162,7 @@ minetest.register_node("mcl_core:stone_with_redstone_lit", { light_source = 9, is_ground_content = true, stack_max = 64, - groups = {pickaxey=4, not_in_creative_inventory=1}, + groups = {pickaxey=4, not_in_creative_inventory=1, material_stone=1}, drop = { items = { max_items = 1, @@ -193,7 +193,7 @@ minetest.register_node("mcl_core:stone_with_lapis", { tiles = {"default_stone.png^default_mineral_lapis.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=3, building_block=1}, + groups = {pickaxey=3, building_block=1, material_stone=1}, drop = { max_items = 1, items = { @@ -215,7 +215,7 @@ minetest.register_node("mcl_core:stone_with_emerald", { tiles = {"default_stone.png^default_mineral_emerald.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=4, building_block=1}, + groups = {pickaxey=4, building_block=1, material_stone=1}, drop = "mcl_core:emerald", sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 15, @@ -228,7 +228,7 @@ minetest.register_node("mcl_core:stone_with_diamond", { tiles = {"default_stone.png^default_mineral_diamond.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=4, building_block=1}, + groups = {pickaxey=4, building_block=1, material_stone=1}, drop = "mcl_core:diamond", sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 15, @@ -239,7 +239,7 @@ minetest.register_node("mcl_core:stonebrick", { description = "Stone Bricks", tiles = {"default_stone_brick.png"}, stack_max = 64, - groups = {pickaxey=1, stone=1, stonebrick=1, building_block=1, deco_block=1}, + groups = {pickaxey=1, stone=1, stonebrick=1, building_block=1, deco_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -250,7 +250,7 @@ minetest.register_node("mcl_core:stonebrickcarved", { tiles = {"default_stonebrick_carved.png"}, is_ground_content = false, stack_max = 64, - groups = {pickaxey=1, stone=1, stonebrick=1, building_block=1, deco_block=1}, + groups = {pickaxey=1, stone=1, stonebrick=1, building_block=1, deco_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -261,7 +261,7 @@ minetest.register_node("mcl_core:stonebrickcracked", { tiles = {"default_stonebrick_cracked.png"}, is_ground_content = false, stack_max = 64, - groups = {pickaxey=1, stone=1, stonebrick=1, building_block=1, deco_block=1}, + groups = {pickaxey=1, stone=1, stonebrick=1, building_block=1, deco_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -271,7 +271,7 @@ minetest.register_node("mcl_core:stonebrickmossy", { description = "Mossy Stone Bricks", tiles = {"default_stonebrick_mossy.png"}, stack_max = 64, - groups = {pickaxey=1, stone=1, stonebrick=1, building_block=1, deco_block=1}, + groups = {pickaxey=1, stone=1, stonebrick=1, building_block=1, deco_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -283,7 +283,7 @@ minetest.register_node("mcl_core:granite", { tiles = {"default_granite.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=1, stone=1, building_block=1}, + groups = {pickaxey=1, stone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -294,7 +294,7 @@ minetest.register_node("mcl_core:granite_smooth", { _doc_items_longdesc = "Polished granite is a decorational building block made from granite.", tiles = {"default_granite_smooth.png"}, stack_max = 64, - groups = {pickaxey=1, stone=1, building_block=1}, + groups = {pickaxey=1, stone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -306,7 +306,7 @@ minetest.register_node("mcl_core:andesite", { tiles = {"default_andesite.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=1, stone=1, building_block=1}, + groups = {pickaxey=1, stone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -317,7 +317,7 @@ minetest.register_node("mcl_core:andesite_smooth", { _doc_items_longdesc = "Polished andesite is a decorational building block made from andesite.", tiles = {"default_andesite_smooth.png"}, stack_max = 64, - groups = {pickaxey=1, stone=1, building_block=1}, + groups = {pickaxey=1, stone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -329,7 +329,7 @@ minetest.register_node("mcl_core:diorite", { tiles = {"default_diorite.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=1, stone=1, building_block=1}, + groups = {pickaxey=1, stone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -340,7 +340,7 @@ minetest.register_node("mcl_core:diorite_smooth", { _doc_items_longdesc = "Polished diorite is a decorational building block made from diorite.", tiles = {"default_diorite_smooth.png"}, stack_max = 64, - groups = {pickaxey=1, stone=1, building_block=1}, + groups = {pickaxey=1, stone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -441,7 +441,7 @@ minetest.register_node("mcl_core:gravel", { tiles = {"default_gravel.png"}, is_ground_content = true, stack_max = 64, - groups = {handy=1,shovely=1, falling_node=1, building_block=1}, + groups = {handy=1,shovely=1, falling_node=1, building_block=1, material_sand=1}, drop = { max_items = 1, items = { @@ -463,7 +463,7 @@ minetest.register_node("mcl_core:sand", { tiles = {"default_sand.png"}, is_ground_content = true, stack_max = 64, - groups = {handy=1,shovely=1, falling_node=1, sand=1, soil_sugarcane=1, building_block=1}, + groups = {handy=1,shovely=1, falling_node=1, sand=1, soil_sugarcane=1, building_block=1, material_sand=1}, sounds = mcl_sounds.node_sound_sand_defaults(), _mcl_blast_resistance = 2.5, _mcl_hardness = 0.5, @@ -475,7 +475,7 @@ minetest.register_node("mcl_core:sandstone", { tiles = {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_normal.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=2, sandstone=1, building_block=1}, + groups = {pickaxey=2, sandstone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 4, _mcl_hardness = 0.8, @@ -487,7 +487,7 @@ minetest.register_node("mcl_core:sandstonesmooth", { tiles = {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_smooth.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=1, sandstone=1, building_block=1}, + groups = {pickaxey=1, sandstone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 4, _mcl_hardness = 0.8, @@ -499,7 +499,7 @@ minetest.register_node("mcl_core:sandstonecarved", { tiles = {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_carved.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=1, sandstone=1, building_block=1}, + groups = {pickaxey=1, sandstone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 4, _mcl_hardness = 0.8, @@ -513,7 +513,7 @@ minetest.register_node("mcl_core:redsand", { tiles = {"default_red_sand.png"}, is_ground_content = true, stack_max = 64, - groups = {handy=1,shovely=1, falling_node=1, sand=1, soil_sugarcane=1, building_block=1}, + groups = {handy=1,shovely=1, falling_node=1, sand=1, soil_sugarcane=1, building_block=1, material_sand=1}, sounds = mcl_sounds.node_sound_sand_defaults(), _mcl_blast_resistance = 2.5, _mcl_hardness = 0.5, @@ -525,7 +525,7 @@ minetest.register_node("mcl_core:redsandstone", { tiles = {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_normal.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=1, redsandstone=1, building_block=1}, + groups = {pickaxey=1, redsandstone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 4, _mcl_hardness = 0.8, @@ -537,7 +537,7 @@ minetest.register_node("mcl_core:redsandstonesmooth", { tiles = {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_smooth.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=1, redsandstone=1, building_block=1}, + groups = {pickaxey=1, redsandstone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 4, _mcl_hardness = 0.8, @@ -549,7 +549,7 @@ minetest.register_node("mcl_core:redsandstonecarved", { tiles = {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_carved.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=1, redsandstone=1, building_block=1}, + groups = {pickaxey=1, redsandstone=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 4, _mcl_hardness = 0.8, @@ -580,7 +580,7 @@ minetest.register_node("mcl_core:brick_block", { tiles = {"default_brick.png"}, is_ground_content = false, stack_max = 64, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 2, @@ -592,7 +592,7 @@ minetest.register_node("mcl_core:bone_block", { is_ground_content = false, paramtype2 = "facedir", on_place = mcl_util.rotate_axis, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 10, _mcl_hardness = 2, @@ -609,7 +609,7 @@ minetest.register_node("mcl_core:tree", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, stack_max = 64, - groups = {handy=1,axey=1, tree=1, flammable=2, building_block=1}, + groups = {handy=1,axey=1, tree=1, flammable=2, building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 10, _mcl_hardness = 2, @@ -675,7 +675,7 @@ minetest.register_node("mcl_core:wood", { tiles = {"default_wood.png"}, stack_max = 64, is_ground_content = false, - groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1}, + groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 15, _mcl_hardness = 2, @@ -689,7 +689,7 @@ minetest.register_node("mcl_core:darktree", { paramtype2 = "facedir", on_place = mcl_util.rotate_axis, stack_max = 64, - groups = {handy=1,axey=1, tree=1,flammable=2,building_block=1}, + groups = {handy=1,axey=1, tree=1,flammable=2,building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 10, _mcl_hardness = 2, @@ -755,7 +755,7 @@ minetest.register_node("mcl_core:darkwood", { tiles = {"default_planks_big_oak.png"}, stack_max = 64, is_ground_content = false, - groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1}, + groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 15, _mcl_hardness = 2, @@ -803,7 +803,7 @@ minetest.register_node("mcl_core:junglewood", { tiles = {"default_junglewood.png"}, stack_max = 64, is_ground_content = false, - groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1}, + groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 15, _mcl_hardness = 2, @@ -869,7 +869,7 @@ minetest.register_node("mcl_core:acaciatree", { stack_max = 64, paramtype2 = "facedir", on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, tree=1,flammable=2,building_block=1}, + groups = {handy=1,axey=1, tree=1,flammable=2,building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 10, _mcl_hardness = 2, @@ -880,7 +880,7 @@ minetest.register_node("mcl_core:acaciawood", { tiles = {"default_acaciawood.png"}, stack_max = 64, is_ground_content = false, - groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1}, + groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 15, _mcl_hardness = 2, @@ -944,7 +944,7 @@ minetest.register_node("mcl_core:sprucetree", { stack_max = 64, paramtype2 = "facedir", on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, tree=1,flammable=2,building_block=1}, + groups = {handy=1,axey=1, tree=1,flammable=2,building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 10, _mcl_hardness = 2, @@ -955,7 +955,7 @@ minetest.register_node("mcl_core:sprucewood", { tiles = {"default_sprucewood.png"}, stack_max = 64, is_ground_content = false, - groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1}, + groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 15, _mcl_hardness = 2, @@ -1025,7 +1025,7 @@ minetest.register_node("mcl_core:birchtree", { stack_max = 64, paramtype2 = "facedir", on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, tree=1,flammable=2,building_block=1}, + groups = {handy=1,axey=1, tree=1,flammable=2,building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 10, _mcl_hardness = 2, @@ -1036,7 +1036,7 @@ minetest.register_node("mcl_core:birchwood", { tiles = {"default_planks_birch.png"}, stack_max = 64, is_ground_content = false, - groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1}, + groups = {handy=1,axey=1, flammable=3,wood=1,building_block=1, material_wood=1}, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 15, _mcl_hardness = 2, @@ -1161,7 +1161,7 @@ minetest.register_node("mcl_core:bedrock", { _doc_items_longdesc = "Bedrock is a very hard type of rock. It can not be broken, destroyed, collected or moved by normal means, unless in Creative Mode.", tiles = {"default_bedrock.png"}, stack_max = 64, - groups = {creative_breakable=1, building_block=1}, + groups = {creative_breakable=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), is_ground_content = false, on_blast = function() end, @@ -1204,7 +1204,7 @@ minetest.register_node("mcl_core:glass", { paramtype = "light", sunlight_propagates = true, stack_max = 64, - groups = {handy=1, glass=1, building_block=1}, + groups = {handy=1, glass=1, building_block=1, material_glass=1}, sounds = mcl_sounds.node_sound_glass_defaults(), drop = "", _mcl_blast_resistance = 1.5, @@ -1502,7 +1502,7 @@ minetest.register_node("mcl_core:cobble", { tiles = {"default_cobble.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=1, building_block=1, deco_block=1}, + groups = {pickaxey=1, building_block=1, deco_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 2, @@ -1513,7 +1513,7 @@ minetest.register_node("mcl_core:mossycobble", { tiles = {"default_mossycobble.png"}, is_ground_content = true, stack_max = 64, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 2, @@ -1525,7 +1525,7 @@ minetest.register_node("mcl_core:coalblock", { tiles = {"default_coal_block.png"}, is_ground_content = false, stack_max = 64, - groups = {pickaxey=1, flammable=1, building_block=1}, + groups = {pickaxey=1, flammable=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 5, @@ -1598,7 +1598,7 @@ minetest.register_node("mcl_core:obsidian", { is_ground_content = true, sounds = mcl_sounds.node_sound_stone_defaults(), stack_max = 64, - groups = {pickaxey=5, building_block=1}, + groups = {pickaxey=5, building_block=1, material_stone=1}, _mcl_blast_resistance = 6000, _mcl_hardness = 50, }) diff --git a/mods/ITEMS/mcl_end/init.lua b/mods/ITEMS/mcl_end/init.lua index 7c0018a9..27e5761b 100644 --- a/mods/ITEMS/mcl_end/init.lua +++ b/mods/ITEMS/mcl_end/init.lua @@ -3,7 +3,7 @@ minetest.register_node("mcl_end:end_stone", { description = "End Stone", tiles = {"mcl_end_end_stone.png"}, stack_max = 64, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 45, _mcl_hardness = 3, @@ -14,7 +14,7 @@ minetest.register_node("mcl_end:end_bricks", { tiles = {"mcl_end_end_bricks.png"}, is_ground_content = false, stack_max = 64, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 4, _mcl_hardness = 0.8, @@ -25,7 +25,7 @@ minetest.register_node("mcl_end:purpur_block", { tiles = {"mcl_end_purpur_block.png"}, is_ground_content = false, stack_max = 64, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -38,7 +38,7 @@ minetest.register_node("mcl_end:purpur_pillar", { is_ground_content = false, on_place = mcl_util.rotate_axis, tiles = {"mcl_end_purpur_pillar_top.png", "mcl_end_purpur_pillar_top.png", "mcl_end_purpur_pillar.png"}, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -67,7 +67,7 @@ minetest.register_node("mcl_end:end_rod", { paramtype2 = "wallmounted", light_source = 14, sunlight_propagates = true, - groups = { dig_immediate=3, deco_block=1 }, + groups = { dig_immediate=3, deco_block=1, }, node_box = { type = "fixed", fixed = { @@ -113,7 +113,7 @@ minetest.register_node("mcl_end:dragon_egg", { selection_box = { type = "regular", }, - groups = {handy=1, falling_node = 1, deco_block = 1, not_in_creative_inventory = 1 }, + groups = {handy=1, falling_node = 1, deco_block = 1, not_in_creative_inventory = 1, }, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 45, _mcl_hardness = 3, @@ -146,7 +146,7 @@ minetest.register_node("mcl_end:chorus_flower", { node_box = chorus_flower_box, selection_box = { type = "regular" }, sounds = mcl_sounds.node_sound_wood_defaults(), - groups = {handy=1,axey=1, deco_block = 1 }, + groups = {handy=1,axey=1, deco_block = 1, }, _mcl_blast_resistance = 2, _mcl_hardness = 0.4, }) @@ -167,7 +167,7 @@ minetest.register_node("mcl_end:chorus_flower_dead", { selection_box = { type = "regular" }, sounds = mcl_sounds.node_sound_wood_defaults(), drop = "mcl_end:chorus_flower", - groups = {handy=1,axey=1, deco_block = 1}, + groups = {handy=1,axey=1, deco_block = 1, }, _mcl_blast_resistance = 2, _mcl_hardness = 0.4, }) @@ -200,7 +200,7 @@ minetest.register_node("mcl_end:chorus_plant", { sounds = mcl_sounds.node_sound_wood_defaults(), -- TODO: Check drop probability drop = { items = { {items = { "mcl_end:chorus_fruit", rarity = 4 } } } }, - groups = {handy=1,axey=1, not_in_creative_inventory = 1,}, + groups = {handy=1,axey=1, not_in_creative_inventory = 1, }, _mcl_blast_resistance = 2, _mcl_hardness = 0.4, }) diff --git a/mods/ITEMS/mcl_furnaces/init.lua b/mods/ITEMS/mcl_furnaces/init.lua index a696dbcb..dfed01ec 100644 --- a/mods/ITEMS/mcl_furnaces/init.lua +++ b/mods/ITEMS/mcl_furnaces/init.lua @@ -278,7 +278,7 @@ minetest.register_node("mcl_furnaces:furnace", { "default_furnace_side.png", "default_furnace_front.png" }, paramtype2 = "facedir", - groups = {pickaxey=1, container=4, deco_block=1}, + groups = {pickaxey=1, container=4, deco_block=1, material_stone=1}, is_ground_content = false, sounds = mcl_sounds.node_sound_stone_defaults(), @@ -335,7 +335,7 @@ minetest.register_node("mcl_furnaces:furnace_active", { paramtype2 = "facedir", light_source = 13, drop = "mcl_furnaces:furnace", - groups = {pickaxey=1, container=4, deco_block=1, not_in_creative_inventory=1}, + groups = {pickaxey=1, container=4, deco_block=1, not_in_creative_inventory=1, material_stone=1}, is_ground_content = false, sounds = mcl_sounds.node_sound_stone_defaults(), on_timer = furnace_node_timer, diff --git a/mods/ITEMS/mcl_jukebox/init.lua b/mods/ITEMS/mcl_jukebox/init.lua index 1f7a786d..a085a322 100644 --- a/mods/ITEMS/mcl_jukebox/init.lua +++ b/mods/ITEMS/mcl_jukebox/init.lua @@ -91,7 +91,7 @@ minetest.register_node("mcl_jukebox:jukebox", { _doc_items_usagehelp = "Place a music disc into an empty jukebox to insert the music disc and play music. If the jukebox already has a music disc, you will retrieve this music disc first. The music can only be heard by you, not by other players.", tiles = {"mcl_jukebox_top.png", "mcl_jukebox_side.png", "mcl_jukebox_side.png"}, sounds = mcl_sounds.node_sound_wood_defaults(), - groups = {handy=1,axey=1, deco_block=1}, + groups = {handy=1,axey=1, deco_block=1, material_wood=1}, on_construct = function(pos) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() diff --git a/mods/ITEMS/mcl_mushrooms/huge.lua b/mods/ITEMS/mcl_mushrooms/huge.lua index 5fb8d1ca..f36576df 100644 --- a/mods/ITEMS/mcl_mushrooms/huge.lua +++ b/mods/ITEMS/mcl_mushrooms/huge.lua @@ -1,5 +1,5 @@ local template = { - groups = {handy=1,axey=1, huge_mushroom = 1, building_block = 1, not_in_creative_inventory = 1 }, + groups = {handy=1,axey=1, huge_mushroom = 1, building_block = 1, not_in_creative_inventory = 1, material_wood=1 }, sounds = mcl_sounds.node_sound_wood_defaults(), is_ground_content = true, _mcl_blast_resistance = 1, diff --git a/mods/ITEMS/mcl_nether/init.lua b/mods/ITEMS/mcl_nether/init.lua index b24946ec..c2494b37 100644 --- a/mods/ITEMS/mcl_nether/init.lua +++ b/mods/ITEMS/mcl_nether/init.lua @@ -3,7 +3,7 @@ minetest.register_node("mcl_nether:glowstone", { tiles = {"mcl_nether_glowstone.png"}, is_ground_content = true, stack_max = 64, - groups = {handy=1,building_block=1}, + groups = {handy=1,building_block=1, material_glass=1}, drop = { max_items = 1, items = { @@ -24,7 +24,7 @@ minetest.register_node("mcl_nether:quartz_ore", { stack_max = 64, tiles = {"mcl_nether_quartz_ore.png"}, is_ground_content = true, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, drop = 'mcl_nether:quartz', sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 15, @@ -36,7 +36,7 @@ minetest.register_node("mcl_nether:netherrack", { stack_max = 64, tiles = {"mcl_nether_netherrack.png"}, is_ground_content = true, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 2, _mcl_hardness = 0.4, @@ -50,7 +50,7 @@ minetest.register_node("mcl_nether:magma", { is_ground_content = true, light_source = 3, sunlight_propagates = false, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), -- From walkover mod on_walk_over = function(loc, nodeiamon, player) @@ -67,7 +67,7 @@ minetest.register_node("mcl_nether:soul_sand", { stack_max = 64, tiles = {"mcl_nether_soul_sand.png"}, is_ground_content = true, - groups = {handy=1,shovely=1, building_block=1,soil_nether_wart=1}, + groups = {handy=1,shovely=1, building_block=1,soil_nether_wart=1, material_sand=1}, collision_box = { type = "fixed", fixed = { -0.5, -0.5, -0.5, 0.5, 0.5 - 2/16, 0.5 }, @@ -84,7 +84,7 @@ minetest.register_node("mcl_nether:nether_brick", { stack_max = 64, tiles = {"mcl_nether_nether_brick.png"}, is_ground_content = false, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 2, @@ -96,7 +96,7 @@ minetest.register_node("mcl_nether:red_nether_brick", { stack_max = 64, tiles = {"mcl_nether_red_nether_brick.png"}, is_ground_content = false, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 2, @@ -124,7 +124,7 @@ minetest.register_node("mcl_nether:quartz_block", { stack_max = 64, is_ground_content = false, tiles = {"mcl_nether_quartz_block_top.png", "mcl_nether_quartz_block_bottom.png", "mcl_nether_quartz_block_side.png"}, - groups = {pickaxey=1, quartz_block=1,building_block=1}, + groups = {pickaxey=1, quartz_block=1,building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 4, _mcl_hardness = 0.8, @@ -135,7 +135,7 @@ minetest.register_node("mcl_nether:quartz_chiseled", { stack_max = 64, is_ground_content = false, tiles = {"mcl_nether_quartz_chiseled_top.png", "mcl_nether_quartz_chiseled_top.png", "mcl_nether_quartz_chiseled_side.png"}, - groups = {pickaxey=1, quartz_block=1,building_block=1}, + groups = {pickaxey=1, quartz_block=1,building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 4, _mcl_hardness = 0.8, @@ -148,7 +148,7 @@ minetest.register_node("mcl_nether:quartz_pillar", { is_ground_content = false, on_place = mcl_util.rotate_axis, tiles = {"mcl_nether_quartz_pillar_top.png", "mcl_nether_quartz_pillar_top.png", "mcl_nether_quartz_pillar_side.png"}, - groups = {pickaxey=1, quartz_block=1,building_block=1}, + groups = {pickaxey=1, quartz_block=1,building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 4, _mcl_hardness = 0.8, diff --git a/mods/ITEMS/mcl_ocean/init.lua b/mods/ITEMS/mcl_ocean/init.lua index 869282b1..75942f56 100644 --- a/mods/ITEMS/mcl_ocean/init.lua +++ b/mods/ITEMS/mcl_ocean/init.lua @@ -15,7 +15,7 @@ minetest.register_node("mcl_ocean:sea_lantern", { } }, tiles = {{name="mcl_ocean_sea_lantern.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=1.25}}}, - groups = {handy=1, building_block=1}, + groups = {handy=1, building_block=1, material_glass=1}, sounds = mcl_sounds.node_sound_glass_defaults(), _mcl_blast_resistance = 1.5, _mcl_hardness = 0.3, @@ -26,7 +26,7 @@ minetest.register_node("mcl_ocean:prismarine", { stack_max = 64, is_ground_content = false, tiles = {{name="mcl_ocean_prismarine_anim.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=45.0}}}, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -37,7 +37,7 @@ minetest.register_node("mcl_ocean:prismarine_brick", { stack_max = 64, is_ground_content = false, tiles = {"mcl_ocean_prismarine_bricks.png"}, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, @@ -48,7 +48,7 @@ minetest.register_node("mcl_ocean:prismarine_dark", { stack_max = 64, is_ground_content = false, tiles = {"mcl_ocean_prismarine_dark.png"}, - groups = {pickaxey=1, building_block=1}, + groups = {pickaxey=1, building_block=1, material_stone=1}, sounds = mcl_sounds.node_sound_stone_defaults(), _mcl_blast_resistance = 30, _mcl_hardness = 1.5, diff --git a/mods/ITEMS/signs/init.lua b/mods/ITEMS/signs/init.lua index ae323c63..9cba7e02 100644 --- a/mods/ITEMS/signs/init.lua +++ b/mods/ITEMS/signs/init.lua @@ -137,7 +137,7 @@ local signs_yard = { {delta = {x = 0.05, y = 0, z = 0}, yaw = math.pi / 2}, } -local sign_groups = {handy=1,axey=1, flammable=1, deco_block=1} +local sign_groups = {handy=1,axey=1, flammable=1, deco_block=1, material_wood=1} local construct_sign = function(pos) local meta = minetest.get_meta(pos) diff --git a/mods/ITEMS/stairs/init.lua b/mods/ITEMS/stairs/init.lua index 48d4bb9e..83757e9f 100644 --- a/mods/ITEMS/stairs/init.lua +++ b/mods/ITEMS/stairs/init.lua @@ -257,86 +257,86 @@ end -- Note sure if it is a good idea to preserve this oddity. stairs.register_stair("wood", "mcl_core:wood", - {handy=1,axey=1, flammable=3,wood_stairs=1}, + {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, {"default_wood.png"}, "Oak Wood Stairs", mcl_sounds.node_sound_wood_defaults(), 2) stairs.register_slab("wood", "mcl_core:wood", - {handy=1,axey=1, flammable=3,wood_slab=1}, + {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, {"default_wood.png"}, "Oak Wood Slab", mcl_sounds.node_sound_wood_defaults(), 2) stairs.register_stair("junglewood", "mcl_core:junglewood", - {handy=1,axey=1, flammable=3,wood_stairs=1}, + {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, {"default_junglewood.png"}, "Jungle Wood Stairs", mcl_sounds.node_sound_wood_defaults(), 2) stairs.register_slab("junglewood", "mcl_core:junglewood", - {handy=1,axey=1, flammable=3,wood_slab=1}, + {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, {"default_junglewood.png"}, "Jungle Wood Slab", mcl_sounds.node_sound_wood_defaults(), 2) stairs.register_stair("acaciawood", "mcl_core:acaciawood", - {handy=1,axey=1, flammable=3,wood_stairs=1}, + {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, {"default_acaciawood.png"}, "Acacia Wood Stairs", mcl_sounds.node_sound_wood_defaults(), 2) stairs.register_slab("acaciawood", "mcl_core:acaciawood", - {handy=1,axey=1, flammable=3,wood_slab=1}, + {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, {"default_acaciawood.png"}, "Acacia Wood Slab", mcl_sounds.node_sound_wood_defaults(), 2) stairs.register_stair("sprucewood", "mcl_core:sprucewood", - {handy=1,axey=1, flammable=3,wood_stairs=1}, + {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, {"default_sprucewood.png"}, "Spruce Wood Stairs", mcl_sounds.node_sound_wood_defaults(), 2) stairs.register_slab("sprucewood", "mcl_core:sprucewood", - {handy=1,axey=1, flammable=3,wood_slab=1}, + {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, {"default_sprucewood.png"}, "Spruce Wood Slab", mcl_sounds.node_sound_wood_defaults(), 2) stairs.register_stair("birchwood", "mcl_core:birchwood", - {handy=1,axey=1, flammable=3,wood_stairs=1}, + {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, {"default_planks_birch.png"}, "Birch Wood Stairs", mcl_sounds.node_sound_wood_defaults(), 2) stairs.register_slab("birchwood", "mcl_core:birchwood", - {handy=1,axey=1, flammable=3,wood_slab=1}, + {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, {"default_planks_birch.png"}, "Birch Wood Slab", mcl_sounds.node_sound_wood_defaults(), 2) stairs.register_stair("darkwood", "mcl_core:darkwood", - {handy=1,axey=1, flammable=3,wood_stairs=1}, + {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, {"default_planks_big_oak.png"}, "Dark Oak Wood Stairs", mcl_sounds.node_sound_wood_defaults(), 2) stairs.register_slab("darkwood", "mcl_core:darkwood", - {handy=1,axey=1, flammable=3,wood_slab=1}, + {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, {"default_planks_big_oak.png"}, "Dark Oak Wood Slab", mcl_sounds.node_sound_wood_defaults(), 2) stairs.register_slab("stone", "mcl_core:stone", - {pickaxey=1}, + {pickaxey=1, material_stone=1}, {"stairs_stone_slab_top.png", "stairs_stone_slab_top.png", "stairs_stone_slab_side.png"}, "Stone Slab", mcl_sounds.node_sound_stone_defaults(), 2, "Double Stone Slab") @@ -347,51 +347,51 @@ stairs.register_stair_and_slab_simple("brick_block", "mcl_core:brick_block", "Br stairs.register_stair("sandstone", "group:sandstone", - {pickaxey=1}, + {pickaxey=1, material_stone=1}, {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_normal.png"}, "Sandstone Stairs", mcl_sounds.node_sound_stone_defaults(), 0.8, nil, "mcl_core:sandstone") stairs.register_slab("sandstone", "group:sandstone", - {pickaxey=1}, + {pickaxey=1, material_stone=1}, {"default_sandstone_top.png", "default_sandstone_bottom.png", "default_sandstone_normal.png"}, "Sandstone Slab", mcl_sounds.node_sound_stone_defaults(), 2, nil, "mcl_core:sandstone") stairs.register_stair("redsandstone", "group:redsandstone", - {pickaxey=1}, + {pickaxey=1, material_stone=1}, {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_normal.png"}, "Red Sandstone Stairs", mcl_sounds.node_sound_stone_defaults(), 0.8, nil, "mcl_core:redsandstone") stairs.register_slab("redsandstone", "group:redsandstone", - {pickaxey=1}, + {pickaxey=1, material_stone=1}, {"default_redsandstone_top.png", "default_redsandstone_bottom.png", "default_redsandstone_normal.png"}, "Red Sandstone Slab", mcl_sounds.node_sound_stone_defaults(), 2, nil, "mcl_core:redsandstone") stairs.register_stair("stonebrick", "group:stonebrick", - {pickaxey=1}, + {pickaxey=1, material_stone=1}, {"default_stone_brick.png"}, "Stone Bricks Stairs", mcl_sounds.node_sound_stone_defaults(), 1.5, nil, "mcl_core:stonebrick") stairs.register_slab("stonebrick", "group:stonebrick", - {pickaxey=1}, + {pickaxey=1, material_stone=1}, {"default_stone_brick.png"}, "Stone Bricks Slab", mcl_sounds.node_sound_stone_defaults(), 2, nil, "mcl_core:stonebrick") stairs.register_stair("quartzblock", "group:quartz_block", - {pickaxey=1}, + {pickaxey=1, material_stone=1}, {"mcl_nether_quartz_block_top.png", "mcl_nether_quartz_block_bottom.png", "mcl_nether_quartz_block_side.png"}, "Quartz Stairs", mcl_sounds.node_sound_stone_defaults(), 0.8, nil, "mcl_nether:quartz_block") stairs.register_slab("quartzblock", "group:quartz_block", - {pickaxey=1}, + {pickaxey=1, material_stone=1}, {"mcl_nether_quartz_block_top.png", "mcl_nether_quartz_block_bottom.png", "mcl_nether_quartz_block_side.png"}, "Quartz Slab", mcl_sounds.node_sound_stone_defaults(), 2, nil, "mcl_nether:quartz_block") stairs.register_stair_and_slab("nether_brick", "mcl_nether:nether_brick", - {pickaxey=1}, + {pickaxey=1, material_stone=1}, {"mcl_nether_nether_brick.png"}, "Nether Brick Stairs", "Nether Brick Slab", @@ -399,13 +399,13 @@ stairs.register_stair_and_slab("nether_brick", "mcl_nether:nether_brick", 2) stairs.register_stair("purpur_block", "mcl_end:purpur_block", - {pickaxey=1}, + {pickaxey=1, material_stone=1}, {"mcl_end_purpur_block.png"}, "Purpur Stairs", mcl_sounds.node_sound_stone_defaults(), 1.5) stairs.register_slab("purpur_block", "mcl_end:purpur_block", - {pickaxey=1}, + {pickaxey=1, material_stone=1}, {"mcl_end_purpur_block.png"}, "Purpur Slab", mcl_sounds.node_sound_stone_defaults(), diff --git a/mods/ITEMS/xpanes/init.lua b/mods/ITEMS/xpanes/init.lua index f8eea5b1..ef885646 100644 --- a/mods/ITEMS/xpanes/init.lua +++ b/mods/ITEMS/xpanes/init.lua @@ -166,7 +166,7 @@ local pane = function(description, node, append) inventory_image = "xpanes_pane_glass"..append..".png", wield_image = "xpanes_pane_glass"..append..".png", sounds = mcl_sounds.node_sound_glass_defaults(), - groups = {handy=1}, + groups = {handy=1, material_glass=1}, recipe = { {node, node, node}, {node, node, node},