From a598fa3067e81babeb09f39e42d14a6d720383f4 Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Fri, 2 Sep 2022 12:04:03 -0400 Subject: [PATCH 01/10] add not in creative inventory group to bed extended since it is made by placing a bed over top of another --- homedecor_bedroom/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homedecor_bedroom/init.lua b/homedecor_bedroom/init.lua index 29a5b8b0..b8666daa 100644 --- a/homedecor_bedroom/init.lua +++ b/homedecor_bedroom/init.lua @@ -101,7 +101,7 @@ homedecor.register("bed_extended", { palette = "unifieddyes_palette_colorwallmounted.png", selection_box = bed_sbox, 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 = { key = "node_sound_wood_defaults", }, From 8893d66dc64e4d8d1b51cb9da1ccf9fe43e802d7 Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Thu, 20 Oct 2022 21:59:11 -0400 Subject: [PATCH 02/10] fix https://github.com/mt-mods/dreambuilder_game/issues/20 - quote on quote improper dor rotation which turned out to be badly applied model work around --- homedecor_doors_and_gates/init.lua | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/homedecor_doors_and_gates/init.lua b/homedecor_doors_and_gates/init.lua index 415b04d2..265915d2 100644 --- a/homedecor_doors_and_gates/init.lua +++ b/homedecor_doors_and_gates/init.lua @@ -26,25 +26,25 @@ local door_list = { sounds = default.node_sound_wood_defaults(), sound_open = "homedecor_door_open", sound_close = "homedecor_door_close", - mesh = "homedecor_door_fancy.obj" + mesh = "homedecor_door_fancy" }, { name = "french_oak", description = S("French door, Oak-colored"), sounds = default.node_sound_glass_defaults(), - mesh = "homedecor_door_french.obj" + mesh = "homedecor_door_french" }, { name = "french_mahogany", description = S("French door, Mahogany-colored"), sounds = default.node_sound_glass_defaults(), - mesh = "homedecor_door_french.obj" + mesh = "homedecor_door_french" }, { name = "french_white", description = S("French door, White"), sounds = default.node_sound_glass_defaults(), - mesh = "homedecor_door_french.obj" + mesh = "homedecor_door_french" }, { name = "basic_panel", @@ -59,7 +59,7 @@ local door_list = { sounds = default.node_sound_metal_defaults(), sound_open = "doors_steel_door_open", sound_close = "doors_steel_door_close", - mesh = "homedecor_door_wrought_iron.obj" + mesh = "homedecor_door_wrought_iron" }, { name = "carolina", @@ -74,13 +74,13 @@ local door_list = { sounds = default.node_sound_wood_defaults(), sound_open = "homedecor_door_open", sound_close = "homedecor_door_close", - mesh = "homedecor_door_wood_glass_3.obj" + mesh = "homedecor_door_wood_glass_3" }, { name = "closet_mahogany", description = S("Mahogany Closet Door"), sounds = default.node_sound_wood_defaults(), - mesh = "homedecor_door_closet.obj" + mesh = "homedecor_door_closet" }, { name = "closet_oak", @@ -93,6 +93,7 @@ local door_list = { local old_doors = {} local door_types = {"_a", "_b", "_c", "_d"} +local door_conversion = {["_c"]="_a", ["_d"]="_b"} local function generate_door(def) local default_settings = { @@ -125,14 +126,15 @@ local function generate_door(def) end 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)) --hack to get around doors not allowing custom meshes - if door.mesh then + if mesh then for _, v in pairs(door_types) do + if door_conversion[v] then v=door_conversion[v] end minetest.override_item("doors:homedecor_" .. name .. v, { - mesh = door.mesh + mesh = mesh .. v .. ".obj" }) end end From 33710f710bb89fe198d8359713a88ca1a8af5a68 Mon Sep 17 00:00:00 2001 From: superfloh247 Date: Sat, 19 Nov 2022 14:34:36 +0100 Subject: [PATCH 03/10] restart smoke particle effects on reload (#48) * restart smoke particle effects on reload * restore table in fake_fire:reload_particles * Update fake_fire/init.lua Co-authored-by: OgelGames Co-authored-by: OgelGames --- fake_fire/init.lua | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/fake_fire/init.lua b/fake_fire/init.lua index 21f47531..94f706a6 100644 --- a/fake_fire/init.lua +++ b/fake_fire/init.lua @@ -1,5 +1,7 @@ local S = minetest.get_translator("fake_fire") +local fake_fire_reload_particles_nodes = {} + local function fire_particles_on(pos) -- 3 layers of fire local meta = minetest.get_meta(pos) local id1 = minetest.add_particlespawner({ -- 1 layer big particles fire @@ -253,6 +255,7 @@ local materials = { for _, mat in ipairs(materials) do 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, { description = desc, tiles = {tex.."^chimney_top.png", tex}, @@ -326,10 +329,24 @@ minetest.register_alias("fake_fire:flint", "fake_fire:flint_and_steel") minetest.register_lbm({ name = "fake_fire:reload_particles", label = "restart fire particles on reload", - nodenames = {"fake_fire:fancy_fire"}, + nodenames = { "fake_fire:fancy_fire" }, run_at_every_load = true, action = function(pos, node) fire_particles_off(pos) fire_particles_on(pos) 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 +}) + From 0384943a0ad7873c1ecdcd56ed7fca81294e3571 Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Sat, 26 Nov 2022 21:00:02 -0500 Subject: [PATCH 04/10] fix https://github.com/mt-mods/homedecor_modpack/issues/49 --- homedecor_common/registration.lua | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/homedecor_common/registration.lua b/homedecor_common/registration.lua index 90830688..83f8b96f 100644 --- a/homedecor_common/registration.lua +++ b/homedecor_common/registration.lua @@ -8,6 +8,19 @@ function homedecor.register(name, original_def) def.is_furnace = nil + if minetest.get_modpath("mcl_core") then + 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 + end + def.drawtype = def.drawtype or (def.mesh and "mesh") or (def.node_box and "nodebox") From 55bbd478d91a4702f86ced40be262751c2968660 Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Wed, 30 Nov 2022 17:48:28 -0500 Subject: [PATCH 05/10] fix all or edge cases for https://github.com/mt-mods/homedecor_modpack/issues/49 not caught by the last commit --- building_blocks/alias.lua | 3 ++- building_blocks/node_stairs.lua | 30 ++++++++++++++++++++++++------ fake_fire/init.lua | 12 ++++++++---- homedecor_3d_extras/init.lua | 8 ++++++++ homedecor_common/registration.lua | 20 +++++++++----------- homedecor_doors_and_gates/init.lua | 3 ++- homedecor_lighting/init.lua | 27 ++++++++++++++++++--------- homedecor_misc/init.lua | 12 ++++++++---- homedecor_roofing/init.lua | 15 ++++++++++++--- homedecor_seating/armchairs.lua | 3 ++- homedecor_seating/longsofas.lua | 3 ++- homedecor_seating/sofas.lua | 3 ++- homedecor_tables/coffeetable.lua | 3 ++- homedecor_tables/endtable.lua | 3 ++- homedecor_wardrobe/init.lua | 3 ++- itemframes/init.lua | 6 ++++-- lavalamp/init.lua | 6 ++++-- 17 files changed, 111 insertions(+), 49 deletions(-) diff --git a/building_blocks/alias.lua b/building_blocks/alias.lua index f930061d..7f2c1b3b 100644 --- a/building_blocks/alias.lua +++ b/building_blocks/alias.lua @@ -33,7 +33,8 @@ if not minetest.get_modpath("technic") then description = S("Granite"), tiles = { "technic_granite.png" }, is_ground_content = true, - groups = {cracky=1, dig_stone=2}, + groups = {cracky=1, dig_stone=2, pickaxey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_stone_defaults", }, diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index 41059212..6bf9602a 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -1,6 +1,18 @@ local S = minetest.get_translator("building_blocks") 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) if minetest.get_modpath("moreblocks") then local mod, name = nodename:match("(.*):(.*)") @@ -128,7 +140,8 @@ minetest.register_node("building_blocks:brobble_spread", { }, sunlight_propagates = 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 @@ -150,7 +163,8 @@ if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopbloc }, sunlight_propagates = 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 = { key = "node_sound_dirt_defaults", }, @@ -171,7 +185,8 @@ minetest.register_node("building_blocks:Tarmac_spread", { }, sunlight_propagates = 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 = { key = "node_sound_dirt_defaults", }, @@ -190,7 +205,8 @@ minetest.register_node("building_blocks:terrycloth_towel", { }, sunlight_propagates = 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", { @@ -213,7 +229,8 @@ minetest.register_node("building_blocks:BWtile", { }, sunlight_propagates = 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", { @@ -229,7 +246,8 @@ minetest.register_node("building_blocks:Fireplace", { light_source = minetest.LIGHT_MAX, sunlight_propagates = 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 = { key = "node_sound_stone_defaults", }, diff --git a/fake_fire/init.lua b/fake_fire/init.lua index 94f706a6..68efec28 100644 --- a/fake_fire/init.lua +++ b/fake_fire/init.lua @@ -144,7 +144,8 @@ minetest.register_node("fake_fire:ice_fire", { drawtype = "plantlike", paramtype = "light", 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, buildable_to = true, walkable = false, @@ -184,7 +185,8 @@ minetest.register_node("fake_fire:fancy_fire", { paramtype = "light", paramtype2 = "facedir", 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, light_source = 13, walkable = false, @@ -228,7 +230,8 @@ minetest.register_node("fake_fire:embers", { aspect_w=16, aspect_h=16, length=2}}, }, light_source = 9, - groups = {crumbly=3, dig_stone=2}, + groups = {crumbly=3, dig_stone=2, handy=1}, + _mcl_hardness=0.6, paramtype = "light", _sound_def = { key = "node_sound_dirt_defaults", @@ -259,7 +262,8 @@ for _, mat in ipairs(materials) do minetest.register_node("fake_fire:chimney_top_"..name, { description = desc, 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", _sound_def = { key = "node_sound_stone_defaults", diff --git a/homedecor_3d_extras/init.lua b/homedecor_3d_extras/init.lua index 50776547..563445f2 100644 --- a/homedecor_3d_extras/init.lua +++ b/homedecor_3d_extras/init.lua @@ -94,16 +94,22 @@ if minetest.get_modpath("doors") then local def for _,mat in ipairs({"wood", "steel"}) do 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" minetest.register_node(":doors:door_"..mat.."_a", def) 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" minetest.register_node(":doors:door_"..mat.."_b", def) end for _,mat in ipairs({"", "_steel"}) do def = table.copy(minetest.registered_nodes["doors:trapdoor"..mat]) + def.groups.handy = 1 + def._mcl_hardness=0.6 def.drawtype = "mesh" def.mesh = "homedecor_3d_trapdoor"..mat..".obj" def.tiles = { @@ -113,6 +119,8 @@ if minetest.get_modpath("doors") then minetest.register_node(":doors:trapdoor"..mat, def) 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.drawtype = "mesh" def.tiles = { diff --git a/homedecor_common/registration.lua b/homedecor_common/registration.lua index 83f8b96f..16abc545 100644 --- a/homedecor_common/registration.lua +++ b/homedecor_common/registration.lua @@ -8,17 +8,15 @@ function homedecor.register(name, original_def) def.is_furnace = nil - if minetest.get_modpath("mcl_core") then - 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 + 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 diff --git a/homedecor_doors_and_gates/init.lua b/homedecor_doors_and_gates/init.lua index 265915d2..4d646c42 100644 --- a/homedecor_doors_and_gates/init.lua +++ b/homedecor_doors_and_gates/init.lua @@ -246,7 +246,8 @@ for i, g in ipairs(gate_list) do tiles = tiles, paramtype = "light", use_texture_alpha = "clip", - groups = {snappy=3}, + groups = {snappy=3, axey=5}, + _mcl_hardness=1.6, sounds = default.node_sound_wood_defaults(), paramtype2 = "facedir", selection_box = { diff --git a/homedecor_lighting/init.lua b/homedecor_lighting/init.lua index 39901b1d..03eca8a9 100644 --- a/homedecor_lighting/init.lua +++ b/homedecor_lighting/init.lua @@ -275,7 +275,8 @@ for brightness_level = 0, 14 do wall_side = { -0.5, -0.5, -0.5, 0, 0.5, 0.5 } }, 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, _sound_def = { 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 } }, 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, _sound_def = { 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 } }, 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, _sound_def = { key = "node_sound_glass_defaults", @@ -865,7 +868,8 @@ for _, light_brightn_name in ipairs({"off", "on"}) do "homedecor:rope_light_on_floor_off", "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 = { key = "node_sound_stone_defaults", }, @@ -913,7 +917,8 @@ for _, light_brightn_name in ipairs({"off", "on"}) do "homedecor:rope_light_on_ceiling_off", "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 = { key = "node_sound_stone_defaults", }, @@ -1127,7 +1132,8 @@ minetest.register_node(":homedecor:chain_steel_top", { sunlight_propagates = true, paramtype = "light", 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, }) @@ -1141,7 +1147,8 @@ minetest.register_node(":homedecor:chain_brass_top", { sunlight_propagates = true, paramtype = "light", 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, }) @@ -1168,7 +1175,8 @@ minetest.register_node(":homedecor:chandelier_steel", { drawtype = "mesh", mesh = "homedecor_chandelier.obj", use_texture_alpha = "clip", - groups = {cracky=3, dig_glass=1}, + groups = {cracky=3, dig_glass=1, pickaxey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_stone_defaults", }, @@ -1197,7 +1205,8 @@ minetest.register_node(":homedecor:chandelier_brass", { drawtype = "mesh", mesh = "homedecor_chandelier.obj", use_texture_alpha = "clip", - groups = {cracky=3, dig_glass=1}, + groups = {cracky=3, dig_glass=1, pickaxey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_stone_defaults", }, diff --git a/homedecor_misc/init.lua b/homedecor_misc/init.lua index 81e57e41..fa43ee7c 100644 --- a/homedecor_misc/init.lua +++ b/homedecor_misc/init.lua @@ -629,7 +629,8 @@ minetest.register_node(":homedecor:tatami_mat", { description = S("Japanese tatami"), drawtype = "nodebox", paramtype = "light", - groups = {snappy=3}, + groups = {snappy=3, axey=5}, + _mcl_hardness=1.6, node_box = { type = "fixed", fixed = { @@ -1028,7 +1029,8 @@ minetest.register_node(":homedecor:japanese_wall_top", { }, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3}, + groups = {snappy=3, axey=5}, + _mcl_hardness=1.6, selection_box = jp_cbox, collision_box = jp_cbox, _sound_def = { @@ -1046,7 +1048,8 @@ minetest.register_node(":homedecor:japanese_wall_middle", { }, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3}, + groups = {snappy=3, axey=5}, + _mcl_hardness=1.6, selection_box = jp_cbox, collision_box = jp_cbox, _sound_def = { @@ -1064,7 +1067,8 @@ minetest.register_node(":homedecor:japanese_wall_bottom", { }, paramtype = "light", paramtype2 = "facedir", - groups = {snappy=3}, + groups = {snappy=3, axey=5}, + _mcl_hardness=1.6, selection_box = jp_cbox, collision_box = jp_cbox, _sound_def = { diff --git a/homedecor_roofing/init.lua b/homedecor_roofing/init.lua index 9c0d1a56..93a5738e 100644 --- a/homedecor_roofing/init.lua +++ b/homedecor_roofing/init.lua @@ -8,7 +8,8 @@ minetest.register_node(":homedecor:skylight", { tiles = { homedecor.textures.glass }, wield_image = homedecor.textures.glass, 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", _sound_def = { key = "node_sound_glass_defaults", @@ -24,7 +25,8 @@ minetest.register_node(":homedecor:skylight_frosted", { wield_image = "homedecor_skylight_frosted.png", inventory_image = "homedecor_skylight_frosted_inv.png", use_texture_alpha = "blend", - groups = { snappy = 3, dig_tree = 2 }, + groups = { snappy = 3, dig_tree = 2, axey=5}, + _mcl_hardness=1.6, paramtype = "light", _sound_def = { 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", paramtype = "light", walkable = false, - groups = { snappy = 3, dig_tree = 2 }, + groups = { snappy = 3, dig_tree = 2, axey=5}, + _mcl_hardness=1.6, _sound_def = { 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 tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" } end + groups.axey=5 minetest.register_node(":"..modname..":shingle_outer_corner_" .. subname, { description = S("@1 (outer corner)", description), @@ -100,6 +104,7 @@ homedecor_roofing.register_outer_corner = function(modname, subname, groups, slo selection_box = ocorner_cbox, collision_box = ocorner_cbox, groups = groups, + _mcl_hardness=1.6, on_place = minetest.rotate_node, _sound_def = { 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 tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" } end + groups.axey=5 minetest.register_node(":"..modname..":shingle_inner_corner_" .. subname, { description = S("@1 (inner corner)", description), @@ -123,6 +129,7 @@ homedecor_roofing.register_inner_corner = function(modname, subname, groups, slo paramtype2 = "facedir", collision_box = icorner_cbox, groups = groups, + _mcl_hardness=1.6, on_place = minetest.rotate_node, _sound_def = { key = "node_sound_wood_defaults", @@ -136,6 +143,7 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups if type(slope_image) ~= "table" then tiles = { "homedecor_slope_outer_corner_"..slope_image..".png" } end + groups.axey=5 minetest.register_node(":"..modname..":shingle_side_" .. subname, { description = description, @@ -148,6 +156,7 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups collision_box = slope_cbox, use_texture_alpha = "blend", groups = groups, + _mcl_hardness=1.6, on_place = minetest.rotate_node, _sound_def = { key = "node_sound_wood_defaults", diff --git a/homedecor_seating/armchairs.lua b/homedecor_seating/armchairs.lua index 048b749e..af5ab958 100644 --- a/homedecor_seating/armchairs.lua +++ b/homedecor_seating/armchairs.lua @@ -19,7 +19,8 @@ minetest.register_node(":lrfurn:armchair", { paramtype2 = "colorwallmounted", palette = "unifieddyes_palette_colorwallmounted.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 = { key = "node_sound_wood_defaults", }, diff --git a/homedecor_seating/longsofas.lua b/homedecor_seating/longsofas.lua index 7f757712..35b3f4f8 100644 --- a/homedecor_seating/longsofas.lua +++ b/homedecor_seating/longsofas.lua @@ -18,7 +18,8 @@ minetest.register_node(":lrfurn:longsofa", { palette = "unifieddyes_palette_colorwallmounted.png", inventory_image = "lrfurn_longsofa_inv.png", 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 = { key = "node_sound_wood_defaults", }, diff --git a/homedecor_seating/sofas.lua b/homedecor_seating/sofas.lua index bed5c6cf..b6e50eac 100644 --- a/homedecor_seating/sofas.lua +++ b/homedecor_seating/sofas.lua @@ -18,7 +18,8 @@ minetest.register_node(":lrfurn:sofa", { palette = "unifieddyes_palette_colorwallmounted.png", inventory_image = "lrfurn_sofa_inv.png", 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 = { key = "node_sound_wood_defaults", }, diff --git a/homedecor_tables/coffeetable.lua b/homedecor_tables/coffeetable.lua index 1fed2e55..4db76c74 100644 --- a/homedecor_tables/coffeetable.lua +++ b/homedecor_tables/coffeetable.lua @@ -58,7 +58,8 @@ minetest.register_node(":lrfurn:coffeetable", { paramtype = "light", paramtype2 = "facedir", 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 = { key = "node_sound_wood_defaults", }, diff --git a/homedecor_tables/endtable.lua b/homedecor_tables/endtable.lua index 8d96613f..6fcc373c 100644 --- a/homedecor_tables/endtable.lua +++ b/homedecor_tables/endtable.lua @@ -16,7 +16,8 @@ minetest.register_node(":lrfurn:endtable", { paramtype = "light", paramtype2 = "facedir", 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 = { key = "node_sound_wood_defaults", }, diff --git a/homedecor_wardrobe/init.lua b/homedecor_wardrobe/init.lua index c345fa58..8ecf2413 100644 --- a/homedecor_wardrobe/init.lua +++ b/homedecor_wardrobe/init.lua @@ -93,7 +93,8 @@ local def = { paramtype = "light", paramtype2 = "facedir", - groups = {snappy = 3}, + groups = {snappy = 3, axey=5}, + _mcl_hardness=1.6, selection_box = wd_cbox, collision_box = wd_cbox, sounds = default.node_sound_wood_defaults(), diff --git a/itemframes/init.lua b/itemframes/init.lua index a0af87e9..29152000 100644 --- a/itemframes/init.lua +++ b/itemframes/init.lua @@ -135,7 +135,8 @@ minetest.register_node("itemframes:frame",{ paramtype = "light", paramtype2 = "facedir", sunlight_propagates = true, - groups = {choppy = 2, dig_immediate = 2}, + groups = {choppy = 2, dig_immediate = 2, axey=5}, + _mcl_hardness=1.6, legacy_wallmounted = true, _sound_def = { key = "node_sound_wood_defaults", @@ -215,7 +216,8 @@ minetest.register_node("itemframes:pedestal",{ --}, tiles = {"itemframes_pedestal.png"}, paramtype = "light", - groups = {cracky = 3, dig_stone = 2}, + groups = {cracky = 3, dig_stone = 2, pickaxey=5}, + _mcl_hardness=1.6, _sound_def = { key = "node_sound_stone_defaults", }, diff --git a/lavalamp/init.lua b/lavalamp/init.lua index 458293cd..a377ba3b 100644 --- a/lavalamp/init.lua +++ b/lavalamp/init.lua @@ -34,7 +34,8 @@ minetest.register_node("lavalamp:lavalamp", { type = "fixed", 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 = { key = "node_sound_glass_defaults", }, @@ -64,7 +65,8 @@ minetest.register_node("lavalamp:lavalamp_off", { type = "fixed", 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 = { key = "node_sound_glass_defaults", }, From 9c7eb2e502817683dab309cc20a1282cab9deb05 Mon Sep 17 00:00:00 2001 From: wsor4035 <24964441+wsor4035@users.noreply.github.com> Date: Mon, 20 Feb 2023 19:54:33 -0500 Subject: [PATCH 06/10] fix https://github.com/mt-mods/homedecor_modpack/issues/50/ - swap l to 1 in translations --- itemframes/locale/itemframes.pt.tr | 4 ++-- itemframes/locale/itemframes.pt_BR.tr | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/itemframes/locale/itemframes.pt.tr b/itemframes/locale/itemframes.pt.tr index 8f906cb4..bece5e16 100644 --- a/itemframes/locale/itemframes.pt.tr +++ b/itemframes/locale/itemframes.pt.tr @@ -4,6 +4,6 @@ ### init.lua ### 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 (owned by @1)=Pedestal (pertence a @l) +Pedestal (owned by @1)=Pedestal (pertence a @1) diff --git a/itemframes/locale/itemframes.pt_BR.tr b/itemframes/locale/itemframes.pt_BR.tr index 8f906cb4..bece5e16 100644 --- a/itemframes/locale/itemframes.pt_BR.tr +++ b/itemframes/locale/itemframes.pt_BR.tr @@ -4,6 +4,6 @@ ### init.lua ### 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 (owned by @1)=Pedestal (pertence a @l) +Pedestal (owned by @1)=Pedestal (pertence a @1) From 77f2b0e05b554b2f6563ccb84a7cbf1c48bdb703 Mon Sep 17 00:00:00 2001 From: Niklp <89982526+Niklp09@users.noreply.github.com> Date: Tue, 21 Feb 2023 11:30:11 +0100 Subject: [PATCH 07/10] Fix ugly looking fakegrass (#51) --- building_blocks/node_stairs.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index 6bf9602a..8304632e 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -76,7 +76,7 @@ building_blocks_stairs("building_blocks:Adobe", { }) local grasstex = {"[combine:16x16^[noalpha^[colorize:#006400"} 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 building_blocks_stairs("building_blocks:fakegrass", { tiles = grasstex, From b4297d68a0d9e07f933911643f6c6e331c2dbd4e Mon Sep 17 00:00:00 2001 From: taylorskalyo Date: Sun, 7 May 2023 17:33:30 +0000 Subject: [PATCH 08/10] Fix uncraftable items (#53) * fix large square table top recipes (#41) * fix cabinet with drawers recipes (#41) --- homedecor_kitchen/init.lua | 70 ++++++++++++++++++++++---------------- homedecor_tables/misc.lua | 6 ++-- 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/homedecor_kitchen/init.lua b/homedecor_kitchen/init.lua index 0448a812..f62d69ff 100644 --- a/homedecor_kitchen/init.lua +++ b/homedecor_kitchen/init.lua @@ -605,44 +605,56 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "homedecor:kitchen_cabinet_colorable_steel", - recipe = { + output = "homedecor:kitchen_cabinet_colorable_with_drawers", + 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:kitchen_cabinet_colorable", ""}, - } -}) + {"", cabinet, ""}, + } + }) -minetest.register_craft({ - output = "homedecor:kitchen_cabinet_colorable_steel", - recipe = { + minetest.register_craft({ + output = cabinet.."_steel", + recipe = { {"moreblocks:slab_steelblock_1"}, - { "homedecor:kitchen_cabinet_colorable" }, - } -}) + {cabinet}, + } + }) -minetest.register_craft({ - output = "homedecor:kitchen_cabinet_colorable_marble", - recipe = { + minetest.register_craft({ + output = cabinet.."_marble", + recipe = { {"building_blocks:slab_marble"}, - {"homedecor:kitchen_cabinet_colorable"}, - } -}) + {cabinet}, + } + }) -minetest.register_craft({ - output = "homedecor:kitchen_cabinet_colorable_marble", - recipe = { + minetest.register_craft({ + output = cabinet.."_marble", + recipe = { {"technic:slab_marble_1"}, - {"homedecor:kitchen_cabinet_colorable"}, - } -}) + {cabinet}, + } + }) -minetest.register_craft({ - output = "homedecor:kitchen_cabinet_colorable_granite", - recipe = { + minetest.register_craft({ + output = cabinet.."_granite", + recipe = { {"technic:slab_granite_1"}, - {"homedecor:kitchen_cabinet_colorable"}, - } -}) + {cabinet}, + } + }) +end minetest.register_craft({ type = "shapeless", diff --git a/homedecor_tables/misc.lua b/homedecor_tables/misc.lua index 193fc1d1..f69589a8 100644 --- a/homedecor_tables/misc.lua +++ b/homedecor_tables/misc.lua @@ -126,7 +126,7 @@ for i, mat in ipairs(tabletop_materials) do 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_round_b', 'homedecor:'..m..'_table_small_round') minetest.register_alias('homedecor:'..m..'_table_large', 'homedecor:'..m..'_table_large_square') @@ -187,7 +187,7 @@ minetest.register_craft( { }) minetest.register_craft( { - output = "homedecor:glass_table_large_b 2", + output = "homedecor:glass_table_large_square_b 2", recipe = { { "homedecor:glass_table_small_square", "homedecor:glass_table_small_square" }, } @@ -210,7 +210,7 @@ minetest.register_craft( { }) minetest.register_craft( { - output = "homedecor:wood_table_large_b 2", + output = "homedecor:wood_table_large_square_b 2", recipe = { { "homedecor:wood_table_small_square", "homedecor:wood_table_small_square" }, } From 6bbaa7491d776eb014dc8d2625601a9a142dd9f1 Mon Sep 17 00:00:00 2001 From: taylorskalyo Date: Sun, 7 May 2023 17:48:41 +0000 Subject: [PATCH 09/10] fix burnable wood large table top (#54) --- homedecor_tables/misc.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homedecor_tables/misc.lua b/homedecor_tables/misc.lua index f69589a8..37a08037 100644 --- a/homedecor_tables/misc.lua +++ b/homedecor_tables/misc.lua @@ -232,7 +232,7 @@ minetest.register_craft({ minetest.register_craft({ type = "fuel", - recipe = "homedecor:wood_table_large_b", + recipe = "homedecor:wood_table_large_square_b", burntime = 30, }) From 2c08c1f97b939700e8150cc174d9657e60e05f81 Mon Sep 17 00:00:00 2001 From: Mihin Dissanayake <73010893+MihinMUD@users.noreply.github.com> Date: Fri, 2 Jun 2023 07:29:14 +0530 Subject: [PATCH 10/10] Fix lockable items having the same craft as the normal version (#55) --- homedecor_common/inventory.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/homedecor_common/inventory.lua b/homedecor_common/inventory.lua index 30d9172e..75cfb89d 100644 --- a/homedecor_common/inventory.lua +++ b/homedecor_common/inventory.lua @@ -210,7 +210,7 @@ function homedecor.handle_inventory(name, def, original_def) if lockable then local locked_def = table.copy(original_def) locked_def.description = S("@1 (Locked)", def.description or name) - + locked_def.crafts = nil local locked_inventory = locked_def.inventory locked_inventory.locked = true locked_inventory.lockable = nil -- avoid loops of locked locked stuff