1
0
mirror of https://github.com/mt-mods/homedecor_modpack.git synced 2025-07-15 12:10:25 +02:00

Merge remote-tracking branch 'upstream/master'

This commit is contained in:
2022-05-27 18:34:18 +02:00
125 changed files with 2630 additions and 2635 deletions

View File

@ -241,7 +241,7 @@ for brightness_level = 0, 14 do
}
overlay = {
{ name = "homedecor_glowlight_top_glare.png", color = "white"},
"",
{ name = "homedecor_glowlight_top_glare.png", color = "white"},
{ name = sides_glare, color = "white"},
{ name = sides_glare, color = "white"},
{ name = sides_glare, color = "white"},
@ -263,7 +263,7 @@ for brightness_level = 0, 14 do
description = S("Thick Glowlight"),
tiles = tiles,
overlay_tiles = overlay,
use_texture_alpha = true,
use_texture_alpha = "blend",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "colorwallmounted",
@ -275,9 +275,11 @@ 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 },
groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = nici, dig_glass=1 },
light_source = brightness_level,
sounds = default.node_sound_glass_defaults(),
_sound_def = {
key = "node_sound_glass_defaults",
},
after_place_node = function(pos, placer, itemstack, pointed_thing)
unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
end,
@ -307,7 +309,7 @@ for brightness_level = 0, 14 do
}
overlay = {
{ name = "homedecor_glowlight_top_glare.png", color = "white"},
"",
{ name = "homedecor_glowlight_top_glare.png", color = "white"},
{ name = sides_glare, color = "white"},
{ name = sides_glare, color = "white"},
{ name = sides_glare, color = "white"},
@ -329,7 +331,7 @@ for brightness_level = 0, 14 do
description = S("Thin Glowlight"),
tiles = tiles,
overlay_tiles = overlay,
use_texture_alpha = true,
use_texture_alpha = "blend",
drawtype = "nodebox",
paramtype = "light",
paramtype2 = "colorwallmounted",
@ -341,9 +343,11 @@ 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 },
groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = nici, dig_glass=1 },
light_source = brightness_level,
sounds = default.node_sound_glass_defaults(),
_sound_def = {
key = "node_sound_glass_defaults",
},
after_place_node = function(pos, placer, itemstack, pointed_thing)
unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
end,
@ -374,7 +378,7 @@ for brightness_level = 0, 14 do
}
overlay = {
{ name = "homedecor_glowlight_cube_top_glare.png", color = "white"},
"",
{ name = "homedecor_glowlight_cube_top_glare.png", color = "white"},
{ name = sides_glare, color = "white"},
{ name = sides_glare, color = "white"},
{ name = sides_glare, color = "white"},
@ -396,7 +400,7 @@ for brightness_level = 0, 14 do
description = S("Small Glowlight Cube"),
tiles = tiles,
overlay_tiles = overlay,
use_texture_alpha = true,
use_texture_alpha = "blend",
paramtype = "light",
paramtype2 = "colorwallmounted",
drawtype = "nodebox",
@ -408,9 +412,11 @@ 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 },
groups = { snappy = 3, ud_param2_colorable = 1, not_in_creative_inventory = nici, dig_glass=1 },
light_source = brightness_level,
sounds = default.node_sound_glass_defaults(),
_sound_def = {
key = "node_sound_glass_defaults",
},
after_place_node = function(pos, placer, itemstack, pointed_thing)
unifieddyes.fix_rotation(pos, placer, itemstack, pointed_thing)
end,
@ -440,19 +446,22 @@ for brightness_level = 0, 14 do
lighttex = "homedecor_plasma_lamp_off.png"
end
local gtex=minetest.get_modpath("default") and "default_gold_block.png" or "[combine:16x16^[noalpha^[colorize:#FFD700"
homedecor.register("plasma_lamp_"..brightness_level, {
description = S("Plasma Lamp/Light"),
drawtype = "mesh",
mesh = "plasma_lamp.obj",
tiles = {
"default_gold_block.png",
gtex,
lighttex
},
use_texture_alpha = true,
use_texture_alpha = "blend",
light_source = brightness_level,
sunlight_propagates = true,
groups = {cracky=3, oddly_breakable_by_hand=3, not_in_creative_inventory = nici},
sounds = default.node_sound_glass_defaults(),
_sound_def = {
key = "node_sound_glass_defaults",
},
on_rightclick = homedecor_lighting.toggle_light,
drop = {
items = {
@ -473,10 +482,10 @@ for brightness_level = 0, 14 do
description = S("Ground Lantern/Light"),
mesh = "homedecor_ground_lantern.obj",
tiles = { gen_ls_tex_yellow, "homedecor_generic_metal_wrought_iron.png" },
use_texture_alpha = true,
use_texture_alpha = "blend",
inventory_image = "homedecor_ground_lantern_inv.png",
wield_image = "homedecor_ground_lantern_inv.png",
groups = {snappy=3, not_in_creative_inventory = nici},
groups = {snappy=3, not_in_creative_inventory = nici, dig_glass=1},
light_source = brightness_level,
selection_box = gl_cbox,
walkable = false,
@ -500,10 +509,10 @@ for brightness_level = 0, 14 do
description = S("Hanging Lantern/Light"),
mesh = "homedecor_hanging_lantern.obj",
tiles = { "homedecor_generic_metal_wrought_iron.png", gen_ls_tex_yellow },
use_texture_alpha = true,
use_texture_alpha = "blend",
inventory_image = "homedecor_hanging_lantern_inv.png",
wield_image = "homedecor_hanging_lantern_inv.png",
groups = {snappy=3, not_in_creative_inventory = nici},
groups = {snappy=3, not_in_creative_inventory = nici, dig_glass=1},
light_source = brightness_level,
selection_box = hl_cbox,
walkable = false,
@ -527,10 +536,10 @@ for brightness_level = 0, 14 do
drawtype = "mesh",
mesh = "homedecor_ceiling_lantern.obj",
tiles = { gen_ls_tex_yellow, "homedecor_generic_metal_wrought_iron.png" },
use_texture_alpha = true,
use_texture_alpha = "blend",
inventory_image = "homedecor_ceiling_lantern_inv.png",
description = S("Ceiling Lantern/Light"),
groups = {snappy=3, not_in_creative_inventory = nici},
groups = {snappy=3, not_in_creative_inventory = nici, dig_glass=1},
light_source = brightness_level,
selection_box = cl_cbox,
walkable = false,
@ -549,9 +558,12 @@ for brightness_level = 0, 14 do
homedecor.register("lattice_lantern_large_"..brightness_level, {
description = S("Lattice lantern/Light (large)"),
tiles = { gen_ls_tex_yellow.."^homedecor_lattice_lantern_large_overlay.png" },
groups = { snappy = 3, not_in_creative_inventory = nici },
use_texture_alpha = "clip",
groups = { snappy = 3, not_in_creative_inventory = nici, dig_glass=1 },
light_source = brightness_level,
sounds = default.node_sound_glass_defaults(),
_sound_def = {
key = "node_sound_glass_defaults",
},
on_rightclick = homedecor_lighting.toggle_light,
drop = {
items = {
@ -590,9 +602,12 @@ for brightness_level = 0, 14 do
type = "fixed",
fixed = { -0.25, -0.5, -0.25, 0.25, 0, 0.25 }
},
groups = { snappy = 3, not_in_creative_inventory = nici },
use_texture_alpha = "clip",
groups = { snappy = 3, not_in_creative_inventory = nici, dig_glass=1 },
light_source = brightness_level,
sounds = default.node_sound_glass_defaults(),
_sound_def = {
key = "node_sound_glass_defaults",
},
on_place = minetest.rotate_node,
on_rightclick = homedecor_lighting.toggle_light,
drop = {
@ -628,7 +643,7 @@ for brightness_level = 0, 14 do
selection_box = dlamp_cbox,
node_box = dlamp_cbox,
walkable = false,
groups = {snappy=3, ud_param2_colorable = 1, not_in_creative_inventory = nici},
groups = {snappy=3, ud_param2_colorable = 1, not_in_creative_inventory = nici, dig_glass=1},
after_place_node = function(pos, placer, itemstack, pointed_thing)
unifieddyes.fix_rotation_nsew(pos, placer, itemstack, pointed_thing)
end,
@ -659,7 +674,7 @@ for brightness_level = 0, 14 do
},
inventory_image = "homedecor_ceiling_lamp_inv.png",
light_source = brightness_level,
groups = {snappy=3, not_in_creative_inventory = nici},
groups = {snappy=3, not_in_creative_inventory = nici, dig_glass=1},
walkable = false,
on_rightclick = homedecor_lighting.toggle_light,
drop = {
@ -682,7 +697,8 @@ for brightness_level = 0, 14 do
fixed = { -0.25, -0.5, -0.25, 0.25, 1.5, 0.25 }
}
local wool_brightened = "wool_grey.png^[colorize:#ffffff:"..(brightness_level * 15)
local wool_brightened=(minetest.get_modpath("wool") and "wool_grey.png" or "[combine:16x16^[noalpha6[colorize:#A9A9A9")
.. "^[colorize:#ffffff:"..(brightness_level * 15)
homedecor.register("table_lamp_"..brightness_level, {
description = S("Table Lamp/Light"),
@ -700,7 +716,9 @@ for brightness_level = 0, 14 do
walkable = false,
light_source = brightness_level,
selection_box = tlamp_cbox,
sounds = default.node_sound_wood_defaults(),
_sound_def = {
key = "node_sound_wood_defaults",
},
groups = {cracky=2,oddly_breakable_by_hand=1, ud_param2_colorable = 1, not_in_creative_inventory=nici },
drop = {
items = {
@ -731,7 +749,9 @@ for brightness_level = 0, 14 do
light_source = brightness_level,
groups = {cracky=2,oddly_breakable_by_hand=1, ud_param2_colorable = 1, not_in_creative_inventory=nici },
selection_box = slamp_cbox,
sounds = default.node_sound_wood_defaults(),
_sound_def = {
key = "node_sound_wood_defaults",
},
on_rotate = minetest.get_modpath("screwdriver") and screwdriver.rotate_simple or nil,
--expand = { top="air" },
drop = {
@ -792,11 +812,13 @@ for _, light_brightn_name in ipairs({"off", "on"}) do
fixed = { -0.1875, -0.5, -0.1875, 0.1875, 0, 0.1875 }
},
walkable = false,
use_texture_alpha = true,
light_source = onflag and (default.LIGHT_MAX - 5) or nil,
use_texture_alpha = "blend",
light_source = onflag and (minetest.LIGHT_MAX - 5) or nil,
sunlight_propagates = true,
groups = {cracky=3, oddly_breakable_by_hand=3, not_in_creative_inventory = nici},
sounds = default.node_sound_glass_defaults(),
_sound_def = {
key = "node_sound_glass_defaults",
},
on_rightclick = homedecor_lighting.toggle_light,
drop = {
items = {
@ -844,7 +866,9 @@ for _, light_brightn_name in ipairs({"off", "on"}) do
"group:mesecon_conductor_craftable"
},
groups = {cracky=3, oddly_breakable_by_hand=3, not_in_creative_inventory = nici_m},
sounds = default.node_sound_stone_defaults(),
_sound_def = {
key = "node_sound_stone_defaults",
},
drop = {
items = {
{items = {"homedecor:rope_light_on_floor_"..di} },
@ -890,7 +914,9 @@ for _, light_brightn_name in ipairs({"off", "on"}) do
"group:mesecon_conductor_craftable"
},
groups = {cracky=3, oddly_breakable_by_hand=3, not_in_creative_inventory = nici_m},
sounds = default.node_sound_stone_defaults(),
_sound_def = {
key = "node_sound_stone_defaults",
},
drop = {
items = {
{items = {"homedecor:rope_light_on_ceiling_"..di}},
@ -916,10 +942,10 @@ for _, light_brightn_name in ipairs({"off", "on"}) do
gen_ls_tex_yellow,
"homedecor_generic_metal_wrought_iron.png"
},
use_texture_alpha = true,
use_texture_alpha = "blend",
inventory_image = "homedecor_wall_lamp_inv.png",
groups = {snappy=3, not_in_creative_inventory = nici},
light_source = onflag and (default.LIGHT_MAX - 3) or nil,
groups = {snappy=3, not_in_creative_inventory = nici, dig_glass=1},
light_source = onflag and (minetest.LIGHT_MAX - 3) or nil,
selection_box = wl_cbox,
walkable = false,
drop = {
@ -954,8 +980,9 @@ homedecor.register("candle", {
inventory_image = "homedecor_candle_inv.png",
selection_box = tc_cbox,
walkable = false,
groups = { snappy = 3 },
light_source = default.LIGHT_MAX-4,
use_texture_alpha = "clip",
groups = { snappy = 3, dig_glass=1 },
light_source = minetest.LIGHT_MAX-4,
})
local c_cbox = {
@ -975,8 +1002,9 @@ homedecor.register("candle_thin", {
inventory_image = "homedecor_candle_thin_inv.png",
selection_box = c_cbox,
walkable = false,
groups = { snappy = 3 },
light_source = default.LIGHT_MAX-4,
use_texture_alpha = "clip",
groups = { snappy = 3, dig_glass=1 },
light_source = minetest.LIGHT_MAX-4,
})
local cs_cbox = {
@ -997,8 +1025,9 @@ homedecor.register("candlestick_wrought_iron", {
inventory_image = "homedecor_candlestick_wrought_iron_inv.png",
selection_box = cs_cbox,
walkable = false,
groups = { snappy = 3 },
light_source = default.LIGHT_MAX-4,
use_texture_alpha = "clip",
groups = { snappy = 3, dig_glass=1 },
light_source = minetest.LIGHT_MAX-4,
})
homedecor.register("candlestick_brass", {
@ -1012,8 +1041,9 @@ homedecor.register("candlestick_brass", {
inventory_image = "homedecor_candlestick_brass_inv.png",
selection_box = cs_cbox,
walkable = false,
groups = { snappy = 3 },
light_source = default.LIGHT_MAX-4,
use_texture_alpha = "clip",
groups = { snappy = 3, dig_glass=1 },
light_source = minetest.LIGHT_MAX-4,
})
homedecor.register("wall_sconce", {
@ -1031,8 +1061,9 @@ homedecor.register("wall_sconce", {
fixed = { -0.1875, -0.25, 0.3125, 0.1875, 0.25, 0.5 }
},
walkable = false,
groups = { snappy = 3 },
light_source = default.LIGHT_MAX-4,
use_texture_alpha = "clip",
groups = { snappy = 3, dig_glass=1 },
light_source = minetest.LIGHT_MAX-4,
})
local ol_cbox = {
@ -1053,13 +1084,15 @@ homedecor.register("oil_lamp", {
{ name = "homedecor_generic_metal.png", color = 0xffa00000 },
"homedecor_oil_lamp_glass.png",
},
use_texture_alpha = true,
use_texture_alpha = "blend",
inventory_image = "homedecor_oil_lamp_inv.png",
selection_box = ol_cbox,
walkable = false,
groups = { snappy = 3 },
light_source = default.LIGHT_MAX-3,
sounds = default.node_sound_glass_defaults(),
groups = { snappy = 3, dig_glass=1 },
light_source = minetest.LIGHT_MAX-3,
_sound_def = {
key = "node_sound_glass_defaults",
},
})
homedecor.register("oil_lamp_tabletop", {
@ -1069,9 +1102,11 @@ homedecor.register("oil_lamp_tabletop", {
inventory_image = "homedecor_oil_lamp_tabletop_inv.png",
selection_box = ol_cbox,
collision_box = ol_cbox,
groups = { snappy = 3 },
light_source = default.LIGHT_MAX-3,
sounds = default.node_sound_glass_defaults(),
groups = { snappy = 3, dig_glass=1 },
light_source = minetest.LIGHT_MAX-3,
_sound_def = {
key = "node_sound_glass_defaults",
},
})
local topchains_sbox = {
@ -1092,7 +1127,7 @@ minetest.register_node(":homedecor:chain_steel_top", {
sunlight_propagates = true,
paramtype = "light",
inventory_image = "basic_materials_chain_steel_inv.png",
groups = {cracky=3},
groups = {cracky=3, dig_glass=1},
selection_box = topchains_sbox,
})
@ -1106,7 +1141,7 @@ minetest.register_node(":homedecor:chain_brass_top", {
sunlight_propagates = true,
paramtype = "light",
inventory_image = "basic_materials_chain_brass_inv.png",
groups = {cracky=3},
groups = {cracky=3, dig_glass=1},
selection_box = topchains_sbox,
})
@ -1132,8 +1167,11 @@ minetest.register_node(":homedecor:chandelier_steel", {
},
drawtype = "mesh",
mesh = "homedecor_chandelier.obj",
groups = {cracky=3},
sounds = default.node_sound_stone_defaults(),
use_texture_alpha = "clip",
groups = {cracky=3, dig_glass=1},
_sound_def = {
key = "node_sound_stone_defaults",
},
})
minetest.register_node(":homedecor:chandelier_brass", {
@ -1158,8 +1196,11 @@ minetest.register_node(":homedecor:chandelier_brass", {
},
drawtype = "mesh",
mesh = "homedecor_chandelier.obj",
groups = {cracky=3},
sounds = default.node_sound_stone_defaults(),
use_texture_alpha = "clip",
groups = {cracky=3, dig_glass=1},
_sound_def = {
key = "node_sound_stone_defaults",
},
})
homedecor.register("torch_wall", {
@ -1186,7 +1227,8 @@ homedecor.register("torch_wall", {
type = "fixed",
fixed = { -0.15, -0.45, 0.15, 0.15,0.35, 0.5 },
},
groups = {cracky=3},
use_texture_alpha = "clip",
groups = {cracky=3, dig_glass=1},
})
-- table lamps and standing lamps
@ -1807,46 +1849,19 @@ minetest.register_alias("chains:chandelier_steel", "homedecor:chande
minetest.register_alias("chains:chandelier_brass", "homedecor:chandelier_brass")
minetest.register_alias("homedecor:glowlight_half", "homedecor:glowlight_half_14")
minetest.register_alias("homedecor:glowlight_half_max", "homedecor:glowlight_half_14")
minetest.register_alias("homedecor:glowlight_quarter", "homedecor:glowlight_quarter_14")
minetest.register_alias("homedecor:glowlight_quarter_max", "homedecor:glowlight_quarter_14")
minetest.register_alias("homedecor:glowlight_small_cube", "homedecor:glowlight_small_cube_14")
minetest.register_alias("homedecor:glowlight_small_cube_max", "homedecor:glowlight_small_cube_14")
minetest.register_alias("homedecor:plasma_lamp", "homedecor:plasma_lamp_14")
minetest.register_alias("homedecor:plasma_lamp_max", "homedecor:plasma_lamp_14")
minetest.register_alias("homedecor:ground_lantern", "homedecor:ground_lantern_14")
minetest.register_alias("homedecor:ground_lantern_max", "homedecor:ground_lantern_14")
minetest.register_alias("homedecor:hanging_lantern", "homedecor:hanging_lantern_14")
minetest.register_alias("homedecor:hanging_lantern_max", "homedecor:hanging_lantern_14")
minetest.register_alias("homedecor:ceiling_lantern", "homedecor:ceiling_lantern_14")
minetest.register_alias("homedecor:ceiling_lantern_max", "homedecor:ceiling_lantern_14")
minetest.register_alias("homedecor:lattice_lantern_large", "homedecor:lattice_lantern_large_14")
minetest.register_alias("homedecor:lattice_lantern_large_max", "homedecor:lattice_lantern_large_14")
minetest.register_alias("homedecor:lattice_lantern_small", "homedecor:lattice_lantern_small_14")
minetest.register_alias("homedecor:lattice_lantern_small_max", "homedecor:lattice_lantern_small_14")
minetest.register_alias("homedecor:desk_lamp", "homedecor:desk_lamp_14")
minetest.register_alias("homedecor:desk_lamp_max", "homedecor:desk_lamp_14")
minetest.register_alias("homedecor:ceiling_lamp", "homedecor:ceiling_lamp_14")
minetest.register_alias("homedecor:ceiling_lamp_max", "homedecor:ceiling_lamp_14")
minetest.register_alias("homedecor:table_lamp", "homedecor:table_lamp_14")
minetest.register_alias("homedecor:table_lamp_max", "homedecor:table_lamp_14")
minetest.register_alias("homedecor:standing_lamp", "homedecor:standing_lamp_14")
minetest.register_alias("homedecor:standing_lamp_max", "homedecor:standing_lamp_14")
minetest.register_alias("3dforniture:table_lamp", "homedecor:table_lamp_14")
minetest.register_alias("3dforniture:table_lamp_max", "homedecor:table_lamp_14")
minetest.register_alias("3dforniture:torch_wall", "homedecor:torch_wall")
minetest.register_alias("torch_wall", "homedecor:torch_wall")