nalc/homedecor_modpack
1
0
Fork 1
forked from mtcontrib/homedecor_modpack
Code Issues Pull Requests Releases Wiki Activity

fix all or edge cases for https://github.com/mt-mods/homedecor_modpack/issues/49 not caught by the last commit

Browse Source
This commit is contained in:
unknown 2022-11-30 17:48:28 -05:00
parent 0384943a0a
commit 55bbd478d9
17 changed files with 111 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
building_blocks/alias.lua
View File

@ -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",
},

30
building_blocks/node_stairs.lua
View File

@ -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",
},

12
fake_fire/init.lua
View File

@ -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",

8
homedecor_3d_extras/init.lua
View File

@ -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 = {

20
homedecor_common/registration.lua
View File

@ -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

3
homedecor_doors_and_gates/init.lua
View File

@ -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 = {

27
homedecor_lighting/init.lua
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 }
},
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",
},

12
homedecor_misc/init.lua
View File

@ -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 = {

15
homedecor_roofing/init.lua
View File

@ -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",

3
homedecor_seating/armchairs.lua
View File

@ -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",
},

3
homedecor_seating/longsofas.lua
View File

@ -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",
},

3
homedecor_seating/sofas.lua
View File

@ -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",
},

3
homedecor_tables/coffeetable.lua
View File

@ -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",
},

3
homedecor_tables/endtable.lua
View File

@ -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",
},

3
homedecor_wardrobe/init.lua
View File

@ -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(),

6
itemframes/init.lua
View File

@ -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",
},

6
lavalamp/init.lua
View File

@ -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",
},