1
0
mirror of https://github.com/mt-mods/homedecor_modpack.git synced 2025-07-16 20:50:22 +02:00

Compare commits

...

6 Commits

11 changed files with 51 additions and 69 deletions

View File

@ -164,21 +164,3 @@ minetest.register_lbm({
meta:set_string("palette", "ext") meta:set_string("palette", "ext")
end end
}) })
minetest.register_lbm({
name = "homedecor:recolor_bathroom_tiles",
label = "Convert bathroom tiles to use UD extended palette",
run_at_every_load = false,
nodenames = {
"homedecor:bathroom_tiles_light",
"homedecor:bathroom_tiles_medium",
"homedecor:bathroom_tiles_dark",
},
action = function(pos, node)
local meta = minetest.get_meta(pos)
if meta:get_string("palette") ~= "ext" then
minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] })
meta:set_string("palette", "ext")
end
end
})

View File

@ -3273,6 +3273,19 @@ for i in ipairs(homedecor.banister_materials) do
}) })
end end
unifieddyes.register_color_craft({
output = "",
palette = "split",
neutral_node = "homedecor:banister_wood_horizontal",
type = "shapeless",
output_prefix = "homedecor:banister_wood_horizontal_",
output_suffix = "",
recipe = {
"NEUTRAL_NODE",
"MAIN_DYE",
}
})
if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then if (minetest.get_modpath("technic") and minetest.get_modpath("dye") and minetest.get_modpath("bees")) then
technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"homedecor:oil_extract 2","dye:yellow 1"} }) technic.register_separating_recipe({ input = {"bees:wax 1"}, output = {"homedecor:oil_extract 2","dye:yellow 1"} })
end end

View File

@ -13,3 +13,4 @@ beds?
flowers? flowers?
3d_armor? 3d_armor?
skinsdb? skinsdb?
mesecons?

View File

@ -4,6 +4,8 @@ local S = homedecor_i18n.gettext
local function N_(x) return x end local function N_(x) return x end
local m_rules = mesecon and mesecon.rules and mesecon.rules.pplate
-- doors -- doors
local function isSolid(pos, adjust) local function isSolid(pos, adjust)
@ -264,6 +266,7 @@ for i, side in ipairs(sides) do
drop = "homedecor:door_"..doorname.."_left", drop = "homedecor:door_"..doorname.."_left",
mesecons = { mesecons = {
effector = { effector = {
rules = m_rules,
action_on = function(pos,node) action_on = function(pos,node)
local isClosed = getClosed(pos) local isClosed = getClosed(pos)
if isClosed then if isClosed then
@ -405,6 +408,7 @@ for i, g in ipairs(gate_list) do
end, end,
mesecons = { mesecons = {
effector = { effector = {
rules = m_rules,
action_on = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "closed") end action_on = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "closed") end
} }
} }
@ -433,6 +437,7 @@ for i, g in ipairs(gate_list) do
return itemstack return itemstack
end end
def.mesecons.effector = { def.mesecons.effector = {
rules = m_rules,
action_off = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "open") end action_off = function(pos,node) homedecor.flip_gate(pos,node,nil,gate, "open") end
} }

View File

@ -257,6 +257,8 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
if not pos then return itemstack end if not pos then return itemstack end
local fdir = minetest.dir_to_facedir(placer:get_look_dir()) local fdir = minetest.dir_to_facedir(placer:get_look_dir())
local meta = itemstack:get_meta()
local pindex = meta:get_int("palette_index")
local abovepos = { x=pos.x, y=pos.y+1, z=pos.z } local abovepos = { x=pos.x, y=pos.y+1, z=pos.z }
local abovenode = minetest.get_node(abovepos) local abovenode = minetest.get_node(abovepos)
@ -371,7 +373,7 @@ function homedecor.place_banister(itemstack, placer, pointed_thing)
end end
end end
minetest.set_node(pos, {name = new_place_name, param2 = fdir}) minetest.set_node(pos, {name = new_place_name, param2 = fdir+pindex})
itemstack:take_item() itemstack:take_item()
return itemstack return itemstack
end end

View File

@ -735,28 +735,3 @@ minetest.register_lbm({
meta:set_string("dye", "unifieddyes:"..color) meta:set_string("dye", "unifieddyes:"..color)
end end
}) })
minetest.register_lbm({
name = "homedecor:recolor_lighting",
label = "Convert some kinds of lights to use UD extended palette",
run_at_every_load = false,
nodenames = {
"homedecor:table_lamp_off",
"homedecor:table_lamp_low",
"homedecor:table_lamp_med",
"homedecor:table_lamp_hi",
"homedecor:table_lamp_max",
"homedecor:standing_lamp_off",
"homedecor:standing_lamp_low",
"homedecor:standing_lamp_med",
"homedecor:standing_lamp_hi",
"homedecor:standing_lamp_max",
},
action = function(pos, node)
local meta = minetest.get_meta(pos)
if meta:get_string("palette") ~= "ext" then
minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] })
meta:set_string("palette", "ext")
end
end
})

View File

@ -483,23 +483,19 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
local name, matdesc, tile1, tile2 = unpack(mat) local name, matdesc, tile1, tile2 = unpack(mat)
local nodename = "banister_"..name.."_"..side local nodename = "banister_"..name.."_"..side
local groups = { snappy = 3, not_in_creative_inventory = 1 }
local cbox = { local cbox = {
type = "fixed", type = "fixed",
fixed = { -9/16, -3/16, 5/16, 9/16, 24/16, 8/16 } fixed = { -9/16, -3/16, 5/16, 9/16, 24/16, 8/16 }
} }
if side == "horizontal" then if side == "horizontal" then
groups = { snappy = 3 }
cbox = { cbox = {
type = "fixed", type = "fixed",
fixed = { -8/16, -8/16, 5/16, 8/16, 8/16, 8/16 } fixed = { -8/16, -8/16, 5/16, 8/16, 8/16, 8/16 }
} }
else
minetest.register_alias(string.gsub("homedecor:"..nodename, "diagonal_", ""), "homedecor:"..nodename)
end end
homedecor.register(nodename, { local def = {
description = S("Banister for Stairs (@1, @2)", matdesc, sidedesc), description = S("Banister for Stairs (@1, @2)", matdesc, sidedesc),
mesh = "homedecor_banister_"..side..".obj", mesh = "homedecor_banister_"..side..".obj",
tiles = { tiles = {
@ -507,12 +503,36 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
tile2, tile2,
}, },
inventory_image = "homedecor_banister_"..name.."_inv.png", inventory_image = "homedecor_banister_"..name.."_inv.png",
groups = groups,
selection_box = cbox, selection_box = cbox,
collision_box = cbox, collision_box = cbox,
groups = { snappy = 3},
on_place = homedecor.place_banister, on_place = homedecor.place_banister,
drop = "homedecor:banister_"..name.."_horizontal", drop = "homedecor:banister_"..name.."_horizontal",
}) }
if side ~= "horizontal" then
def.groups.not_in_creative_inventory = 1
end
if name == "wood" then
def.airbrush_replacement_node = "homedecor:banister_wood_"..side.."_grey"
def.groups.ud_param2_colorable = 1
def.paramtype2 = "colorfacedir"
end
homedecor.register(nodename, def)
if name == "wood" then
local nn = "homedecor:"..nodename
local def2 = table.copy(minetest.registered_items[nn])
def2.tiles = {
homedecor.white_wood,
homedecor.white_wood
}
def2.inventory_image = "homedecor_banister_wood_colored_inv.png"
def2.groups.not_in_creative_inventory = 1
unifieddyes.generate_split_palette_nodes(nn, def2, "homedecor:banister_"..name.."_horizontal")
end
end end
end end

View File

@ -34,7 +34,7 @@ homedecor.register("shutter", {
wield_image = inv, wield_image = inv,
paramtype2 = "colorwallmounted", paramtype2 = "colorwallmounted",
palette = "unifieddyes_palette_colorwallmounted.png", palette = "unifieddyes_palette_colorwallmounted.png",
ud_replacement_node = "homedecor:shutter_colored", airbrush_replacement_node = "homedecor:shutter_colored",
groups = { snappy = 3, ud_param2_colorable = 1 }, groups = { snappy = 3, ud_param2_colorable = 1 },
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
selection_box = shutter_cbox, selection_box = shutter_cbox,

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -146,20 +146,3 @@ minetest.register_lbm({
end end
}) })
minetest.register_lbm({
name = "lavalamp:recolor",
label = "Convert 89-color lamps to use UD extended palette",
run_at_every_load = false,
nodenames = {
"lavalamp:lavalamp",
"lavalamp:lavalamp_off"
},
action = function(pos, node)
local meta = minetest.get_meta(pos)
if meta:get_string("palette") ~= "ext" then
minetest.swap_node(pos, { name = node.name, param2 = unifieddyes.convert_classic_palette[node.param2] })
meta:set_string("palette", "ext")
end
end
})

View File

@ -1,3 +1,4 @@
local S = homedecor_i18n.gettext
lrfurn = {} lrfurn = {}
screwdriver = screwdriver or {} screwdriver = screwdriver or {}