Merge remote-tracking branch 'upstream/master'

This commit is contained in:
bri cassa 2023-06-06 00:03:55 +02:00
commit 15300a4413
23 changed files with 194 additions and 89 deletions

View File

@ -33,7 +33,8 @@ if not minetest.get_modpath("technic") then
description = S("Granite"), description = S("Granite"),
tiles = { "technic_granite.png" }, tiles = { "technic_granite.png" },
is_ground_content = true, is_ground_content = true,
groups = {cracky=1, dig_stone=2}, groups = {cracky=1, dig_stone=2, pickaxey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_stone_defaults", key = "node_sound_stone_defaults",
}, },

View File

@ -1,6 +1,18 @@
local S = minetest.get_translator("building_blocks") local S = minetest.get_translator("building_blocks")
local function building_blocks_stairs(nodename, def) local function building_blocks_stairs(nodename, def)
if def.groups and (def.groups.crumbly or def.groups.oddly_breakable_by_hand) then
def.groups["handy"]=1
def._mcl_hardness=0.6
elseif def.groups and (def.groups.snappy or def.groups.choppy) then
def.groups["axey"]=5
def._mcl_hardness=1.6
elseif def.groups and (def.groups.cracky or def.groups.crumbly) then
def.groups["pickaxey"]=5
def._mcl_hardness=1.6
end
minetest.register_node(nodename, def) minetest.register_node(nodename, def)
if minetest.get_modpath("moreblocks") then if minetest.get_modpath("moreblocks") then
local mod, name = nodename:match("(.*):(.*)") local mod, name = nodename:match("(.*):(.*)")
@ -64,7 +76,7 @@ building_blocks_stairs("building_blocks:Adobe", {
}) })
local grasstex = {"[combine:16x16^[noalpha^[colorize:#006400"} local grasstex = {"[combine:16x16^[noalpha^[colorize:#006400"}
if minetest.get_modpath("default") then if minetest.get_modpath("default") then
grasstex = minetest.registered_nodes["default:dirt_with_grass"].tiles grasstex = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"}
end end
building_blocks_stairs("building_blocks:fakegrass", { building_blocks_stairs("building_blocks:fakegrass", {
tiles = grasstex, tiles = grasstex,
@ -128,7 +140,8 @@ minetest.register_node("building_blocks:brobble_spread", {
}, },
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = true, is_ground_content = true,
groups = {crumbly=3, dig_generic=4}, groups = {crumbly=3, dig_generic=4, handy=1},
_mcl_hardness=0.6
}) })
if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then
@ -150,7 +163,8 @@ if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopbloc
}, },
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = true, is_ground_content = true,
groups = {crumbly=2, dig_generic=4}, groups = {crumbly=2, dig_generic=4, handy=1},
_mcl_hardness=0.6,
_sound_def = { _sound_def = {
key = "node_sound_dirt_defaults", key = "node_sound_dirt_defaults",
}, },
@ -171,7 +185,8 @@ minetest.register_node("building_blocks:Tarmac_spread", {
}, },
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = true, is_ground_content = true,
groups = {cracky=3, dig_generic=4}, groups = {cracky=3, dig_generic=4, pickaxey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_dirt_defaults", key = "node_sound_dirt_defaults",
}, },
@ -190,7 +205,8 @@ minetest.register_node("building_blocks:terrycloth_towel", {
}, },
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = true, is_ground_content = true,
groups = {crumbly=3, dig_generic=4}, groups = {crumbly=3, dig_generic=4, handy=1},
_mcl_hardness=0.6
}) })
minetest.register_node("building_blocks:BWtile", { minetest.register_node("building_blocks:BWtile", {
@ -213,7 +229,8 @@ minetest.register_node("building_blocks:BWtile", {
}, },
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = true, is_ground_content = true,
groups = {crumbly=3, dig_generic=4}, groups = {crumbly=3, dig_generic=4, handy=1},
_mcl_hardness=0.6
}) })
minetest.register_node("building_blocks:Fireplace", { minetest.register_node("building_blocks:Fireplace", {
@ -229,7 +246,8 @@ minetest.register_node("building_blocks:Fireplace", {
light_source = minetest.LIGHT_MAX, light_source = minetest.LIGHT_MAX,
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = true, is_ground_content = true,
groups = {cracky=2, dig_generic=4}, groups = {cracky=2, dig_generic=4, pickaxey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_stone_defaults", key = "node_sound_stone_defaults",
}, },

View File

@ -1,5 +1,7 @@
local S = minetest.get_translator("fake_fire") local S = minetest.get_translator("fake_fire")
local fake_fire_reload_particles_nodes = {}
local function fire_particles_on(pos) -- 3 layers of fire local function fire_particles_on(pos) -- 3 layers of fire
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local id1 = minetest.add_particlespawner({ -- 1 layer big particles fire local id1 = minetest.add_particlespawner({ -- 1 layer big particles fire
@ -142,7 +144,8 @@ minetest.register_node("fake_fire:ice_fire", {
drawtype = "plantlike", drawtype = "plantlike",
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {dig_immediate=3, not_in_creative_inventory=1, dig_generic=3}, groups = {dig_immediate=3, not_in_creative_inventory=1, dig_generic=3, handy=1},
_mcl_hardness=0.6,
sunlight_propagates = true, sunlight_propagates = true,
buildable_to = true, buildable_to = true,
walkable = false, walkable = false,
@ -182,7 +185,8 @@ minetest.register_node("fake_fire:fancy_fire", {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
use_texture_alpha = "clip", use_texture_alpha = "clip",
groups = {oddly_breakable_by_hand=3, flammable=0}, groups = {oddly_breakable_by_hand=3, flammable=0, handy=1},
_mcl_hardness=0.6,
sunlight_propagates = true, sunlight_propagates = true,
light_source = 13, light_source = 13,
walkable = false, walkable = false,
@ -226,7 +230,8 @@ minetest.register_node("fake_fire:embers", {
aspect_w=16, aspect_h=16, length=2}}, aspect_w=16, aspect_h=16, length=2}},
}, },
light_source = 9, light_source = 9,
groups = {crumbly=3, dig_stone=2}, groups = {crumbly=3, dig_stone=2, handy=1},
_mcl_hardness=0.6,
paramtype = "light", paramtype = "light",
_sound_def = { _sound_def = {
key = "node_sound_dirt_defaults", key = "node_sound_dirt_defaults",
@ -253,10 +258,12 @@ local materials = {
for _, mat in ipairs(materials) do for _, mat in ipairs(materials) do
local name, desc, tex = unpack(mat) local name, desc, tex = unpack(mat)
table.insert(fake_fire_reload_particles_nodes, "fake_fire:chimney_top_"..name)
minetest.register_node("fake_fire:chimney_top_"..name, { minetest.register_node("fake_fire:chimney_top_"..name, {
description = desc, description = desc,
tiles = {tex.."^chimney_top.png", tex}, tiles = {tex.."^chimney_top.png", tex},
groups = {snappy=3, dig_stone=2}, groups = {snappy=3, dig_stone=2, handy=1},
_mcl_hardness=0.6,
paramtype = "light", paramtype = "light",
_sound_def = { _sound_def = {
key = "node_sound_stone_defaults", key = "node_sound_stone_defaults",
@ -326,7 +333,7 @@ minetest.register_alias("fake_fire:flint", "fake_fire:flint_and_steel")
minetest.register_lbm({ minetest.register_lbm({
name = "fake_fire:reload_particles", name = "fake_fire:reload_particles",
label = "restart fire particles on reload", label = "restart fire particles on reload",
nodenames = {"fake_fire:fancy_fire"}, nodenames = { "fake_fire:fancy_fire" },
run_at_every_load = true, run_at_every_load = true,
action = function(pos, node) action = function(pos, node)
fire_particles_off(pos) fire_particles_off(pos)
@ -334,4 +341,17 @@ minetest.register_lbm({
end end
}) })
minetest.register_lbm({
name = "fake_fire:reload_particles_chimney",
label = "restart chimney smoke on reload",
nodenames = fake_fire_reload_particles_nodes,
run_at_every_load = true,
action = function(pos, node)
if minetest.get_meta(pos):get_int("smoky") ~= 0 then
stop_smoke(pos)
start_fire_effects(pos, node, nil, 1)
end
end
})
minetest.log("action", "[fake_fire] loaded.") minetest.log("action", "[fake_fire] loaded.")

View File

@ -94,16 +94,22 @@ if minetest.get_modpath("doors") then
local def local def
for _,mat in ipairs({"wood", "steel"}) do for _,mat in ipairs({"wood", "steel"}) do
def = table.copy(minetest.registered_nodes["doors:door_"..mat.."_a"]) def = table.copy(minetest.registered_nodes["doors:door_"..mat.."_a"])
def.groups.handy = 1
def._mcl_hardness=0.6
def.mesh = "homedecor_3d_door_"..mat.."_a.obj" def.mesh = "homedecor_3d_door_"..mat.."_a.obj"
minetest.register_node(":doors:door_"..mat.."_a", def) minetest.register_node(":doors:door_"..mat.."_a", def)
def = table.copy(minetest.registered_nodes["doors:door_"..mat.."_b"]) def = table.copy(minetest.registered_nodes["doors:door_"..mat.."_b"])
def.groups.handy = 1
def._mcl_hardness=0.6
def.mesh = "homedecor_3d_door_"..mat.."_b.obj" def.mesh = "homedecor_3d_door_"..mat.."_b.obj"
minetest.register_node(":doors:door_"..mat.."_b", def) minetest.register_node(":doors:door_"..mat.."_b", def)
end end
for _,mat in ipairs({"", "_steel"}) do for _,mat in ipairs({"", "_steel"}) do
def = table.copy(minetest.registered_nodes["doors:trapdoor"..mat]) def = table.copy(minetest.registered_nodes["doors:trapdoor"..mat])
def.groups.handy = 1
def._mcl_hardness=0.6
def.drawtype = "mesh" def.drawtype = "mesh"
def.mesh = "homedecor_3d_trapdoor"..mat..".obj" def.mesh = "homedecor_3d_trapdoor"..mat..".obj"
def.tiles = { def.tiles = {
@ -113,6 +119,8 @@ if minetest.get_modpath("doors") then
minetest.register_node(":doors:trapdoor"..mat, def) minetest.register_node(":doors:trapdoor"..mat, def)
def = table.copy(minetest.registered_nodes["doors:trapdoor"..mat.."_open"]) def = table.copy(minetest.registered_nodes["doors:trapdoor"..mat.."_open"])
def.groups.handy = 1
def._mcl_hardness=0.6
def.mesh = "homedecor_3d_trapdoor"..mat.."_open.obj" def.mesh = "homedecor_3d_trapdoor"..mat.."_open.obj"
def.drawtype = "mesh" def.drawtype = "mesh"
def.tiles = { def.tiles = {

View File

@ -101,7 +101,7 @@ homedecor.register("bed_extended", {
palette = "unifieddyes_palette_colorwallmounted.png", palette = "unifieddyes_palette_colorwallmounted.png",
selection_box = bed_sbox, selection_box = bed_sbox,
node_box = bed_cbox, node_box = bed_cbox,
groups = {snappy=3, ud_param2_colorable = 1, dig_generic=2}, groups = {snappy=3, ud_param2_colorable = 1, dig_generic=2, not_in_creative_inventory=1},
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",
}, },

View File

@ -210,7 +210,7 @@ function homedecor.handle_inventory(name, def, original_def)
if lockable then if lockable then
local locked_def = table.copy(original_def) local locked_def = table.copy(original_def)
locked_def.description = S("@1 (Locked)", def.description or name) locked_def.description = S("@1 (Locked)", def.description or name)
locked_def.crafts = nil
local locked_inventory = locked_def.inventory local locked_inventory = locked_def.inventory
locked_inventory.locked = true locked_inventory.locked = true
locked_inventory.lockable = nil -- avoid loops of locked locked stuff locked_inventory.lockable = nil -- avoid loops of locked locked stuff

View File

@ -8,6 +8,17 @@ function homedecor.register(name, original_def)
def.is_furnace = nil def.is_furnace = nil
if def.groups and (def.groups.crumbly or def.groups.oddly_breakable_by_hand) then
def.groups["handy"]=1
def._mcl_hardness=0.6
elseif def.groups and (def.groups.snappy or def.groups.choppy) then
def.groups["axey"]=5
def._mcl_hardness=1.6
elseif def.groups and (def.groups.cracky or def.groups.crumbly) then
def.groups["pickaxey"]=5
def._mcl_hardness=1.6
end
def.drawtype = def.drawtype def.drawtype = def.drawtype
or (def.mesh and "mesh") or (def.mesh and "mesh")
or (def.node_box and "nodebox") or (def.node_box and "nodebox")

View File

@ -26,25 +26,25 @@ local door_list = {
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
sound_open = "homedecor_door_open", sound_open = "homedecor_door_open",
sound_close = "homedecor_door_close", sound_close = "homedecor_door_close",
mesh = "homedecor_door_fancy.obj" mesh = "homedecor_door_fancy"
}, },
{ {
name = "french_oak", name = "french_oak",
description = S("French door, Oak-colored"), description = S("French door, Oak-colored"),
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
mesh = "homedecor_door_french.obj" mesh = "homedecor_door_french"
}, },
{ {
name = "french_mahogany", name = "french_mahogany",
description = S("French door, Mahogany-colored"), description = S("French door, Mahogany-colored"),
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
mesh = "homedecor_door_french.obj" mesh = "homedecor_door_french"
}, },
{ {
name = "french_white", name = "french_white",
description = S("French door, White"), description = S("French door, White"),
sounds = default.node_sound_glass_defaults(), sounds = default.node_sound_glass_defaults(),
mesh = "homedecor_door_french.obj" mesh = "homedecor_door_french"
}, },
{ {
name = "basic_panel", name = "basic_panel",
@ -59,7 +59,7 @@ local door_list = {
sounds = default.node_sound_metal_defaults(), sounds = default.node_sound_metal_defaults(),
sound_open = "doors_steel_door_open", sound_open = "doors_steel_door_open",
sound_close = "doors_steel_door_close", sound_close = "doors_steel_door_close",
mesh = "homedecor_door_wrought_iron.obj" mesh = "homedecor_door_wrought_iron"
}, },
{ {
name = "carolina", name = "carolina",
@ -74,13 +74,13 @@ local door_list = {
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
sound_open = "homedecor_door_open", sound_open = "homedecor_door_open",
sound_close = "homedecor_door_close", sound_close = "homedecor_door_close",
mesh = "homedecor_door_wood_glass_3.obj" mesh = "homedecor_door_wood_glass_3"
}, },
{ {
name = "closet_mahogany", name = "closet_mahogany",
description = S("Mahogany Closet Door"), description = S("Mahogany Closet Door"),
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
mesh = "homedecor_door_closet.obj" mesh = "homedecor_door_closet"
}, },
{ {
name = "closet_oak", name = "closet_oak",
@ -93,6 +93,7 @@ local door_list = {
local old_doors = {} local old_doors = {}
local door_types = {"_a", "_b", "_c", "_d"} local door_types = {"_a", "_b", "_c", "_d"}
local door_conversion = {["_c"]="_a", ["_d"]="_b"}
local function generate_door(def) local function generate_door(def)
local default_settings = { local default_settings = {
@ -125,14 +126,15 @@ local function generate_door(def)
end end
for _, door in ipairs(door_list) do for _, door in ipairs(door_list) do
local name = door.name local name, mesh = door.name, door.mesh
doors.register("homedecor_" .. name, generate_door(door)) doors.register("homedecor_" .. name, generate_door(door))
--hack to get around doors not allowing custom meshes --hack to get around doors not allowing custom meshes
if door.mesh then if mesh then
for _, v in pairs(door_types) do for _, v in pairs(door_types) do
if door_conversion[v] then v=door_conversion[v] end
minetest.override_item("doors:homedecor_" .. name .. v, { minetest.override_item("doors:homedecor_" .. name .. v, {
mesh = door.mesh mesh = mesh .. v .. ".obj"
}) })
end end
end end
@ -244,7 +246,8 @@ for i, g in ipairs(gate_list) do
tiles = tiles, tiles = tiles,
paramtype = "light", paramtype = "light",
use_texture_alpha = "clip", use_texture_alpha = "clip",
groups = {snappy=3}, groups = {snappy=3, axey=5},
_mcl_hardness=1.6,
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
paramtype2 = "facedir", paramtype2 = "facedir",
selection_box = { selection_box = {

View File

@ -605,44 +605,56 @@ minetest.register_craft({
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:kitchen_cabinet_colorable_steel", output = "homedecor:kitchen_cabinet_colorable_with_drawers",
recipe = { recipe = {
{"homedecor:kitchen_cabinet_colorable", },
}
})
local cabinet_types = { "homedecor:kitchen_cabinet_colorable", "homedecor:kitchen_cabinet_colorable_with_drawers" }
for _, cabinet in ipairs(cabinet_types) do
minetest.register_craft({
output = cabinet.."_steel",
recipe = {
{homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, homedecor.materials.steel_ingot}, {homedecor.materials.steel_ingot, homedecor.materials.steel_ingot, homedecor.materials.steel_ingot},
{"", "homedecor:kitchen_cabinet_colorable", ""}, {"", cabinet, ""},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:kitchen_cabinet_colorable_steel", output = cabinet.."_steel",
recipe = { recipe = {
{"moreblocks:slab_steelblock_1"}, {"moreblocks:slab_steelblock_1"},
{ "homedecor:kitchen_cabinet_colorable" }, {cabinet},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:kitchen_cabinet_colorable_marble", output = cabinet.."_marble",
recipe = { recipe = {
{"building_blocks:slab_marble"}, {"building_blocks:slab_marble"},
{"homedecor:kitchen_cabinet_colorable"}, {cabinet},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:kitchen_cabinet_colorable_marble", output = cabinet.."_marble",
recipe = { recipe = {
{"technic:slab_marble_1"}, {"technic:slab_marble_1"},
{"homedecor:kitchen_cabinet_colorable"}, {cabinet},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "homedecor:kitchen_cabinet_colorable_granite", output = cabinet.."_granite",
recipe = { recipe = {
{"technic:slab_granite_1"}, {"technic:slab_granite_1"},
{"homedecor:kitchen_cabinet_colorable"}, {cabinet},
} }
}) })
end
minetest.register_craft({ minetest.register_craft({
type = "shapeless", type = "shapeless",

View File

@ -275,7 +275,8 @@ for brightness_level = 0, 14 do
wall_side = { -0.5, -0.5, -0.5, 0, 0.5, 0.5 } wall_side = { -0.5, -0.5, -0.5, 0, 0.5, 0.5 }
}, },
node_box = glowlight_nodebox.half, node_box = glowlight_nodebox.half,
groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = nici, dig_glass=1 }, groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = nici, dig_glass=1, axey=5 },
_mcl_hardness=1.6,
light_source = brightness_level, light_source = brightness_level,
_sound_def = { _sound_def = {
key = "node_sound_glass_defaults", key = "node_sound_glass_defaults",
@ -343,7 +344,8 @@ for brightness_level = 0, 14 do
wall_side = { -0.5, -0.5, -0.5, -0.25, 0.5, 0.5 } wall_side = { -0.5, -0.5, -0.5, -0.25, 0.5, 0.5 }
}, },
node_box = glowlight_nodebox.quarter, node_box = glowlight_nodebox.quarter,
groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = nici, dig_glass=1 }, groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = nici, dig_glass=1, axey=5 },
_mcl_hardness=1.6,
light_source = brightness_level, light_source = brightness_level,
_sound_def = { _sound_def = {
key = "node_sound_glass_defaults", key = "node_sound_glass_defaults",
@ -412,7 +414,8 @@ for brightness_level = 0, 14 do
wall_side = { -0.5, -0.25, -0.25, 0, 0.25, 0.25 } wall_side = { -0.5, -0.25, -0.25, 0, 0.25, 0.25 }
}, },
node_box = glowlight_nodebox.small_cube, node_box = glowlight_nodebox.small_cube,
groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = nici, dig_glass=1 }, groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = nici, dig_glass=1, axey=5 },
_mcl_hardness=1.6,
light_source = brightness_level, light_source = brightness_level,
_sound_def = { _sound_def = {
key = "node_sound_glass_defaults", key = "node_sound_glass_defaults",
@ -865,7 +868,8 @@ for _, light_brightn_name in ipairs({"off", "on"}) do
"homedecor:rope_light_on_floor_off", "homedecor:rope_light_on_floor_off",
"group:mesecon_conductor_craftable" "group:mesecon_conductor_craftable"
}, },
groups = {cracky=3, oddly_breakable_by_hand=3, not_in_creative_inventory = nici_m}, groups = {cracky=3, oddly_breakable_by_hand=3, not_in_creative_inventory = nici_m, axey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_stone_defaults", key = "node_sound_stone_defaults",
}, },
@ -913,7 +917,8 @@ for _, light_brightn_name in ipairs({"off", "on"}) do
"homedecor:rope_light_on_ceiling_off", "homedecor:rope_light_on_ceiling_off",
"group:mesecon_conductor_craftable" "group:mesecon_conductor_craftable"
}, },
groups = {cracky=3, oddly_breakable_by_hand=3, not_in_creative_inventory = nici_m}, groups = {cracky=3, oddly_breakable_by_hand=3, not_in_creative_inventory = nici_m, axey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_stone_defaults", key = "node_sound_stone_defaults",
}, },
@ -1127,7 +1132,8 @@ minetest.register_node(":homedecor:chain_steel_top", {
sunlight_propagates = true, sunlight_propagates = true,
paramtype = "light", paramtype = "light",
inventory_image = "basic_materials_chain_steel_inv.png", inventory_image = "basic_materials_chain_steel_inv.png",
groups = {cracky=3, dig_glass=1}, groups = {cracky=3, dig_glass=1, pickaxey=5},
_mcl_hardness=1.6,
selection_box = topchains_sbox, selection_box = topchains_sbox,
}) })
@ -1141,7 +1147,8 @@ minetest.register_node(":homedecor:chain_brass_top", {
sunlight_propagates = true, sunlight_propagates = true,
paramtype = "light", paramtype = "light",
inventory_image = "basic_materials_chain_brass_inv.png", inventory_image = "basic_materials_chain_brass_inv.png",
groups = {cracky=3, dig_glass=1}, groups = {cracky=3, dig_glass=1, pickaxey=5},
_mcl_hardness=1.6,
selection_box = topchains_sbox, selection_box = topchains_sbox,
}) })
@ -1168,7 +1175,8 @@ minetest.register_node(":homedecor:chandelier_steel", {
drawtype = "mesh", drawtype = "mesh",
mesh = "homedecor_chandelier.obj", mesh = "homedecor_chandelier.obj",
use_texture_alpha = "clip", use_texture_alpha = "clip",
groups = {cracky=3, dig_glass=1}, groups = {cracky=3, dig_glass=1, pickaxey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_stone_defaults", key = "node_sound_stone_defaults",
}, },
@ -1197,7 +1205,8 @@ minetest.register_node(":homedecor:chandelier_brass", {
drawtype = "mesh", drawtype = "mesh",
mesh = "homedecor_chandelier.obj", mesh = "homedecor_chandelier.obj",
use_texture_alpha = "clip", use_texture_alpha = "clip",
groups = {cracky=3, dig_glass=1}, groups = {cracky=3, dig_glass=1, pickaxey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_stone_defaults", key = "node_sound_stone_defaults",
}, },

View File

@ -629,7 +629,8 @@ minetest.register_node(":homedecor:tatami_mat", {
description = S("Japanese tatami"), description = S("Japanese tatami"),
drawtype = "nodebox", drawtype = "nodebox",
paramtype = "light", paramtype = "light",
groups = {snappy=3}, groups = {snappy=3, axey=5},
_mcl_hardness=1.6,
node_box = { node_box = {
type = "fixed", type = "fixed",
fixed = { fixed = {
@ -1028,7 +1029,8 @@ minetest.register_node(":homedecor:japanese_wall_top", {
}, },
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3}, groups = {snappy=3, axey=5},
_mcl_hardness=1.6,
selection_box = jp_cbox, selection_box = jp_cbox,
collision_box = jp_cbox, collision_box = jp_cbox,
_sound_def = { _sound_def = {
@ -1046,7 +1048,8 @@ minetest.register_node(":homedecor:japanese_wall_middle", {
}, },
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3}, groups = {snappy=3, axey=5},
_mcl_hardness=1.6,
selection_box = jp_cbox, selection_box = jp_cbox,
collision_box = jp_cbox, collision_box = jp_cbox,
_sound_def = { _sound_def = {
@ -1064,7 +1067,8 @@ minetest.register_node(":homedecor:japanese_wall_bottom", {
}, },
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3}, groups = {snappy=3, axey=5},
_mcl_hardness=1.6,
selection_box = jp_cbox, selection_box = jp_cbox,
collision_box = jp_cbox, collision_box = jp_cbox,
_sound_def = { _sound_def = {

View File

@ -8,7 +8,8 @@ minetest.register_node(":homedecor:skylight", {
tiles = { homedecor.textures.glass }, tiles = { homedecor.textures.glass },
wield_image = homedecor.textures.glass, wield_image = homedecor.textures.glass,
inventory_image = "homedecor_skylight_inv.png", inventory_image = "homedecor_skylight_inv.png",
groups = { snappy = 3, dig_tree = 2 }, groups = { snappy = 3, dig_tree = 2 , axey=5},
_mcl_hardness=1.6,
paramtype = "light", paramtype = "light",
_sound_def = { _sound_def = {
key = "node_sound_glass_defaults", key = "node_sound_glass_defaults",
@ -24,7 +25,8 @@ minetest.register_node(":homedecor:skylight_frosted", {
wield_image = "homedecor_skylight_frosted.png", wield_image = "homedecor_skylight_frosted.png",
inventory_image = "homedecor_skylight_frosted_inv.png", inventory_image = "homedecor_skylight_frosted_inv.png",
use_texture_alpha = "blend", use_texture_alpha = "blend",
groups = { snappy = 3, dig_tree = 2 }, groups = { snappy = 3, dig_tree = 2, axey=5},
_mcl_hardness=1.6,
paramtype = "light", paramtype = "light",
_sound_def = { _sound_def = {
key = "node_sound_glass_defaults", key = "node_sound_glass_defaults",
@ -42,7 +44,8 @@ for s, s_loc in pairs({ ["asphalt"] = S("asphalt"), ["terracotta"] = S("terracot
inventory_image = "homedecor_shingles_"..s.."_inv.png", inventory_image = "homedecor_shingles_"..s.."_inv.png",
paramtype = "light", paramtype = "light",
walkable = false, walkable = false,
groups = { snappy = 3, dig_tree = 2 }, groups = { snappy = 3, dig_tree = 2, axey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",
}, },
@ -89,6 +92,7 @@ homedecor_roofing.register_outer_corner = function(modname, subname, groups, slo
if type(slope_image) ~= "table" then if type(slope_image) ~= "table" then
tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" } tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" }
end end
groups.axey=5
minetest.register_node(":"..modname..":shingle_outer_corner_" .. subname, { minetest.register_node(":"..modname..":shingle_outer_corner_" .. subname, {
description = S("@1 (outer corner)", description), description = S("@1 (outer corner)", description),
@ -100,6 +104,7 @@ homedecor_roofing.register_outer_corner = function(modname, subname, groups, slo
selection_box = ocorner_cbox, selection_box = ocorner_cbox,
collision_box = ocorner_cbox, collision_box = ocorner_cbox,
groups = groups, groups = groups,
_mcl_hardness=1.6,
on_place = minetest.rotate_node, on_place = minetest.rotate_node,
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",
@ -113,6 +118,7 @@ homedecor_roofing.register_inner_corner = function(modname, subname, groups, slo
if type(slope_image) ~= "table" then if type(slope_image) ~= "table" then
tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" } tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" }
end end
groups.axey=5
minetest.register_node(":"..modname..":shingle_inner_corner_" .. subname, { minetest.register_node(":"..modname..":shingle_inner_corner_" .. subname, {
description = S("@1 (inner corner)", description), description = S("@1 (inner corner)", description),
@ -123,6 +129,7 @@ homedecor_roofing.register_inner_corner = function(modname, subname, groups, slo
paramtype2 = "facedir", paramtype2 = "facedir",
collision_box = icorner_cbox, collision_box = icorner_cbox,
groups = groups, groups = groups,
_mcl_hardness=1.6,
on_place = minetest.rotate_node, on_place = minetest.rotate_node,
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",
@ -136,6 +143,7 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups
if type(slope_image) ~= "table" then if type(slope_image) ~= "table" then
tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" } tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" }
end end
groups.axey=5
minetest.register_node(":"..modname..":shingle_side_" .. subname, { minetest.register_node(":"..modname..":shingle_side_" .. subname, {
description = description, description = description,
@ -148,6 +156,7 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups
collision_box = slope_cbox, collision_box = slope_cbox,
use_texture_alpha = "blend", use_texture_alpha = "blend",
groups = groups, groups = groups,
_mcl_hardness=1.6,
on_place = minetest.rotate_node, on_place = minetest.rotate_node,
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",

View File

@ -19,7 +19,8 @@ minetest.register_node(":lrfurn:armchair", {
paramtype2 = "colorwallmounted", paramtype2 = "colorwallmounted",
palette = "unifieddyes_palette_colorwallmounted.png", palette = "unifieddyes_palette_colorwallmounted.png",
inventory_image = "lrfurn_armchair_inv.png", inventory_image = "lrfurn_armchair_inv.png",
groups = {snappy=3, ud_param2_colorable = 1, dig_tree=2}, groups = {snappy=3, ud_param2_colorable = 1, dig_tree=2, axey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",
}, },

View File

@ -18,7 +18,8 @@ minetest.register_node(":lrfurn:longsofa", {
palette = "unifieddyes_palette_colorwallmounted.png", palette = "unifieddyes_palette_colorwallmounted.png",
inventory_image = "lrfurn_longsofa_inv.png", inventory_image = "lrfurn_longsofa_inv.png",
wield_scale = { x = 0.6, y = 0.6, z = 0.6 }, wield_scale = { x = 0.6, y = 0.6, z = 0.6 },
groups = {snappy=3, ud_param2_colorable = 1, dig_tree=2}, groups = {snappy=3, ud_param2_colorable = 1, dig_tree=2, axey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",
}, },

View File

@ -18,7 +18,8 @@ minetest.register_node(":lrfurn:sofa", {
palette = "unifieddyes_palette_colorwallmounted.png", palette = "unifieddyes_palette_colorwallmounted.png",
inventory_image = "lrfurn_sofa_inv.png", inventory_image = "lrfurn_sofa_inv.png",
wield_scale = { x = 0.6, y = 0.6, z = 0.6 }, wield_scale = { x = 0.6, y = 0.6, z = 0.6 },
groups = {snappy=3, ud_param2_colorable = 1, dig_tree=2}, groups = {snappy=3, ud_param2_colorable = 1, dig_tree=2, axey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",
}, },

View File

@ -58,7 +58,8 @@ minetest.register_node(":lrfurn:coffeetable", {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
use_texture_alpha = "blend", use_texture_alpha = "blend",
groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3, axey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",
}, },

View File

@ -16,7 +16,8 @@ minetest.register_node(":lrfurn:endtable", {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
use_texture_alpha = "blend", use_texture_alpha = "blend",
groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3}, groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3, axey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",
}, },

View File

@ -126,7 +126,7 @@ for i, mat in ipairs(tabletop_materials) do
end end
end end
minetest.register_alias('homedecor:'..m..'_table_large_b', 'homedecor:'..m..'_table_large') minetest.register_alias('homedecor:'..m..'_table_large_square_b', 'homedecor:'..m..'_table_large_square')
minetest.register_alias('homedecor:'..m..'_table_small_square_b', 'homedecor:'..m..'_table_small_square') minetest.register_alias('homedecor:'..m..'_table_small_square_b', 'homedecor:'..m..'_table_small_square')
minetest.register_alias('homedecor:'..m..'_table_small_round_b', 'homedecor:'..m..'_table_small_round') minetest.register_alias('homedecor:'..m..'_table_small_round_b', 'homedecor:'..m..'_table_small_round')
minetest.register_alias('homedecor:'..m..'_table_large', 'homedecor:'..m..'_table_large_square') minetest.register_alias('homedecor:'..m..'_table_large', 'homedecor:'..m..'_table_large_square')
@ -187,7 +187,7 @@ minetest.register_craft( {
}) })
minetest.register_craft( { minetest.register_craft( {
output = "homedecor:glass_table_large_b 2", output = "homedecor:glass_table_large_square_b 2",
recipe = { recipe = {
{ "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" }, { "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" },
} }
@ -210,7 +210,7 @@ minetest.register_craft( {
}) })
minetest.register_craft( { minetest.register_craft( {
output = "homedecor:wood_table_large_b 2", output = "homedecor:wood_table_large_square_b 2",
recipe = { recipe = {
{ "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" }, { "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" },
} }
@ -232,7 +232,7 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
type = "fuel", type = "fuel",
recipe = "homedecor:wood_table_large_b", recipe = "homedecor:wood_table_large_square_b",
burntime = 30, burntime = 30,
}) })

View File

@ -93,7 +93,8 @@ local def = {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy = 3}, groups = {snappy = 3, axey=5},
_mcl_hardness=1.6,
selection_box = wd_cbox, selection_box = wd_cbox,
collision_box = wd_cbox, collision_box = wd_cbox,
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),

View File

@ -139,7 +139,8 @@ minetest.register_node("itemframes:frame",{
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
sunlight_propagates = true, sunlight_propagates = true,
groups = {choppy = 2, dig_immediate = 2}, groups = {choppy = 2, dig_immediate = 2, axey=5},
_mcl_hardness=1.6,
legacy_wallmounted = true, legacy_wallmounted = true,
_sound_def = { _sound_def = {
key = "node_sound_wood_defaults", key = "node_sound_wood_defaults",
@ -219,7 +220,8 @@ minetest.register_node("itemframes:pedestal",{
--}, --},
tiles = {"itemframes_pedestal.png"}, tiles = {"itemframes_pedestal.png"},
paramtype = "light", paramtype = "light",
groups = {cracky = 3, dig_stone = 2}, groups = {cracky = 3, dig_stone = 2, pickaxey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_stone_defaults", key = "node_sound_stone_defaults",
}, },

View File

@ -4,6 +4,6 @@
### init.lua ### ### init.lua ###
Item frame=Quadro de Item Item frame=Quadro de Item
Item frame (owned by @1)=Quadro de item (pertence a @l) Item frame (owned by @1)=Quadro de item (pertence a @1)
Pedestal=Pedestal Pedestal=Pedestal
Pedestal (owned by @1)=Pedestal (pertence a @l) Pedestal (owned by @1)=Pedestal (pertence a @1)

View File

@ -4,6 +4,6 @@
### init.lua ### ### init.lua ###
Item frame=Quadro de Item Item frame=Quadro de Item
Item frame (owned by @1)=Quadro de item (pertence a @l) Item frame (owned by @1)=Quadro de item (pertence a @1)
Pedestal=Pedestal Pedestal=Pedestal
Pedestal (owned by @1)=Pedestal (pertence a @l) Pedestal (owned by @1)=Pedestal (pertence a @1)

View File

@ -34,7 +34,8 @@ minetest.register_node("lavalamp:lavalamp", {
type = "fixed", type = "fixed",
fixed = { -0.25, -0.5, -0.25, 0.25,0.5, 0.25 }, fixed = { -0.25, -0.5, -0.25, 0.25,0.5, 0.25 },
}, },
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, ud_param2_colorable = 1, axey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_glass_defaults", key = "node_sound_glass_defaults",
}, },
@ -64,7 +65,8 @@ minetest.register_node("lavalamp:lavalamp_off", {
type = "fixed", type = "fixed",
fixed = { -0.25, -0.5, -0.25, 0.25,0.5, 0.25 }, fixed = { -0.25, -0.5, -0.25, 0.25,0.5, 0.25 },
}, },
groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1}, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3, not_in_creative_inventory=1, axey=5},
_mcl_hardness=1.6,
_sound_def = { _sound_def = {
key = "node_sound_glass_defaults", key = "node_sound_glass_defaults",
}, },