From 4ec6f5a3ecb88dace4b4bfd30bdd3fc2f941cf0a Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Mon, 27 Feb 2017 18:32:35 +0100 Subject: [PATCH] Hardness for the last remaining items --- mods/ENTITIES/mobs/spawner.lua | 3 ++- mods/HUD/craftingpack/crafting/init.lua | 4 +++- .../REDSTONE/mesecons_commandblock/init.lua | 4 ++-- .../ITEMS/REDSTONE/mesecons_noteblock/init.lua | 2 +- mods/ITEMS/doors/init.lua | 18 +++++++++--------- mods/ITEMS/mcl_cocoas/init.lua | 2 +- mods/ITEMS/mcl_farming/melon.lua | 2 +- mods/ITEMS/mcl_farming/wheat.lua | 4 +++- .../minetest-3d_armor/3d_armor_stand/init.lua | 5 ++++- mods/ITEMS/xpanes/init.lua | 14 +++++++++++--- 10 files changed, 37 insertions(+), 21 deletions(-) diff --git a/mods/ENTITIES/mobs/spawner.lua b/mods/ENTITIES/mobs/spawner.lua index d327c9e25..9f4bce72c 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 = {cracky = 1, not_in_creative_inventory = 1}, + groups = {pickaxey=1, not_in_creative_inventory = 1}, drop = "", on_construct = function(pos) @@ -72,6 +72,7 @@ minetest.register_node("mobs:spawner", { end, sounds = mcl_sounds.node_sound_metal_defaults(), _mcl_blast_resistance = 25, + _mcl_hardness = 5, }) -- spawner abm diff --git a/mods/HUD/craftingpack/crafting/init.lua b/mods/HUD/craftingpack/crafting/init.lua index c55e44b2d..4417a56f1 100644 --- a/mods/HUD/craftingpack/crafting/init.lua +++ b/mods/HUD/craftingpack/crafting/init.lua @@ -155,11 +155,13 @@ minetest.register_node("crafting:workbench", { "crafting_workbench_side.png", "crafting_workbench_front.png", "crafting_workbench_front.png"}, paramtype2 = "facedir", paramtype = "light", - groups = {choppy=2,oddly_breakable_by_hand=2,deco_block=1}, + groups = {handy=1,axey=1, deco_block=1}, on_rightclick = function(pos, node, clicker, itemstack) set_workbench(clicker) end, sounds = mcl_sounds.node_sound_wood_defaults(), + _mcl_blast_resistance = 12.5, + _mcl_hardness = 2.5, }) minetest.register_craft({ diff --git a/mods/ITEMS/REDSTONE/mesecons_commandblock/init.lua b/mods/ITEMS/REDSTONE/mesecons_commandblock/init.lua index 73009c1b8..e74dcac2a 100644 --- a/mods/ITEMS/REDSTONE/mesecons_commandblock/init.lua +++ b/mods/ITEMS/REDSTONE/mesecons_commandblock/init.lua @@ -177,7 +177,7 @@ end minetest.register_node("mesecons_commandblock:commandblock_off", { description = "Command Block", tiles = {{name="jeija_commandblock_off.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=2}}}, - groups = {mesecon_effector_off=1, not_in_creative_inventory=1, oddly_breakable_by_hand=5}, + groups = {creative_breakable=1, mesecon_effector_off=1, not_in_creative_inventory=1}, drop = "", on_blast = function() end, on_construct = construct, @@ -194,7 +194,7 @@ minetest.register_node("mesecons_commandblock:commandblock_off", { minetest.register_node("mesecons_commandblock:commandblock_on", { tiles = {{name="jeija_commandblock_off.png", animation={type="vertical_frames", aspect_w=32, aspect_h=32, length=2}}}, - groups = {mesecon_effector_on=1, not_in_creative_inventory=1, oddly_breakable_by_hand=5}, + groups = {creative_breakable=1, mesecon_effector_on=1, not_in_creative_inventory=1}, drop = "", on_blast = function() end, on_construct = construct, diff --git a/mods/ITEMS/REDSTONE/mesecons_noteblock/init.lua b/mods/ITEMS/REDSTONE/mesecons_noteblock/init.lua index 62ec9361a..d00dec017 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, oddly_breakable_by_hand=2}, + groups = {handy=1,axey=1}, drawtype = "allfaces_optional", visual_scale = 1.3, paramtype="light", diff --git a/mods/ITEMS/doors/init.lua b/mods/ITEMS/doors/init.lua index bacfcbb33..8600406cd 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}, _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}, _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}, _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}, _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}, _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}, _mcl_hardness = 3, tiles_bottom = {"door_spruce_b.png", "door_brown.png"}, tiles_top = {"door_spruce_a.png", "door_brown.png"}, @@ -467,7 +467,7 @@ minetest.register_craft({ doors:register_door("doors:door_iron", { description = "Iron Door", inventory_image = "door_steel.png", - groups = {pickaxey=1,door=1,mesecon_effector_on=1}, + groups = {pickaxey=1, door=1,mesecon_effector_on=1}, _mcl_hardness = 5, tiles_bottom = {"door_steel_b.png", "door_grey.png"}, tiles_top = {"door_steel_a.png", "door_grey.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,oddly_breakable_by_hand=2,mesecon_effector_on=1,door=2}, + groups = {handy=1,axey=1, mesecon_effector_on=1,door=2}, _mcl_hardness = 3, sounds = mcl_sounds.node_sound_wood_defaults(), }) @@ -619,7 +619,7 @@ doors:register_trapdoor("doors:iron_trapdoor", { description = "Iron Trapdoor", tiles = {"iron_trapdoor.png"}, wield_image = "iron_trapdoor.png", - groups = {pickaxey=1,mesecon_effector_on=1,door=2}, + groups = {pickaxey=1, mesecon_effector_on=1,door=2}, _mcl_hardness = 5, sounds = mcl_sounds.node_sound_metal_defaults(), sound_open = "doors_steel_door_open", diff --git a/mods/ITEMS/mcl_cocoas/init.lua b/mods/ITEMS/mcl_cocoas/init.lua index b0e421a38..bc596042e 100644 --- a/mods/ITEMS/mcl_cocoas/init.lua +++ b/mods/ITEMS/mcl_cocoas/init.lua @@ -108,7 +108,7 @@ local crop_def = { }, }, groups = { - handy=1,axey=1, cocoa=1, oddly_breakable_by_hand=3, not_in_creative_inventory=1, dig_by_water=1, + handy=1,axey=1, cocoa=1, not_in_creative_inventory=1, dig_by_water=1, }, sounds = mcl_sounds.node_sound_wood_defaults(), _mcl_blast_resistance = 15, diff --git a/mods/ITEMS/mcl_farming/melon.lua b/mods/ITEMS/mcl_farming/melon.lua index cbcd8748b..e9ef34fa4 100644 --- a/mods/ITEMS/mcl_farming/melon.lua +++ b/mods/ITEMS/mcl_farming/melon.lua @@ -2,7 +2,7 @@ minetest.register_node("mcl_farming:melon", { description = "Melon", stack_max = 64, tiles = {"farming_melon_top.png", "farming_melon_top.png", "farming_melon_side.png", "farming_melon_side.png", "farming_melon_side.png", "farming_melon_side.png"}, - groups = {handy=1,axey=1, oddly_breakable_by_hand=2, building_block=1}, + groups = {handy=1,axey=1, building_block=1}, drop = { max_items = 1, items = { diff --git a/mods/ITEMS/mcl_farming/wheat.lua b/mods/ITEMS/mcl_farming/wheat.lua index d5284288d..39e089648 100644 --- a/mods/ITEMS/mcl_farming/wheat.lua +++ b/mods/ITEMS/mcl_farming/wheat.lua @@ -178,8 +178,10 @@ minetest.register_node("mcl_farming:hay_block", { paramtype2 = "facedir", is_ground_content = false, on_place = mcl_util.rotate_axis, - groups = {oddly_breakable_by_hand=3,flammable=2, building_block=1}, + groups = {handy=1, flammable=2, building_block=1}, sounds = mcl_sounds.node_sound_leaves_defaults(), + _mcl_blast_resistance = 2.5, + _mcl_hardness = 0.5, }) minetest.register_craft({ diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua b/mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua index 2f4f2b04d..307e2dfc8 100644 --- a/mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua +++ b/mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua @@ -68,6 +68,7 @@ local function update_entity(pos) end end +-- FIXME: The armor stand should be an entity minetest.register_node("3d_armor_stand:armor_stand", { description = "Armor Stand", drawtype = "mesh", @@ -82,7 +83,9 @@ minetest.register_node("3d_armor_stand:armor_stand", { type = "fixed", fixed = {-0.5,-0.5,-0.5, 0.5,1.4,0.5} }, - groups = {choppy=2, oddly_breakable_by_hand=2, deco_block=1}, + -- FIXME: This should be breakable by 2 quick punches + groups = {handy=1, deco_block=1}, + _mcl_hardness = 2, sounds = mcl_sounds.node_sound_wood_defaults(), on_construct = function(pos) local meta = minetest.get_meta(pos) diff --git a/mods/ITEMS/xpanes/init.lua b/mods/ITEMS/xpanes/init.lua index 57501f309..6a9181d97 100644 --- a/mods/ITEMS/xpanes/init.lua +++ b/mods/ITEMS/xpanes/init.lua @@ -119,6 +119,8 @@ function xpanes.register_pane(name, def) fixed = {{-1/2, -1/2, -1/32, 1/2, 1/2, 1/32}}, }, connect_sides = { "left", "right" }, + _mcl_blast_resistance = def._mcl_blast_resistance, + _mcl_hardness = def._mcl_hardness, }) local groups = table.copy(def.groups) @@ -145,6 +147,8 @@ function xpanes.register_pane(name, def) }, connects_to = {"group:pane", "group:stone", "group:glass", "group:wood", "group:tree"}, drop = drop, + _mcl_blast_resistance = def._mcl_blast_resistance, + _mcl_hardness = def._mcl_hardness, }) minetest.register_craft({ @@ -161,12 +165,14 @@ 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 = {snappy=2, cracky=3, oddly_breakable_by_hand=3}, + groups = {handy=1}, recipe = { {node, node, node}, {node, node, node}, }, drop = "", + _mcl_blast_resistance = 1.5, + _mcl_hardness = 0.3, }) end @@ -176,12 +182,14 @@ xpanes.register_pane("bar", { textures = {"xpanes_pane_iron.png","xpanes_pane_half_iron.png","xpanes_top_iron.png"}, inventory_image = "xpanes_pane_iron.png", wield_image = "xpanes_pane_iron.png", - groups = {cracky=2}, + groups = {pickaxey=1}, sounds = mcl_sounds.node_sound_metal_defaults(), recipe = { {"mcl_core:iron_ingot", "mcl_core:iron_ingot", "mcl_core:iron_ingot"}, {"mcl_core:iron_ingot", "mcl_core:iron_ingot", "mcl_core:iron_ingot"}, - } + }, + _mcl_blast_resistance = 30, + _mcl_hardness = 5, }) -- Glass