From f6f6f3a3c3e1b546389dea6afeb20c3a9e81d494 Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Sat, 27 Nov 2021 19:56:36 -0500 Subject: [PATCH 01/10] fix depreciated setyaw call https://github.com/mt-mods/homedecor_modpack/issues/7 --- itemframes/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/itemframes/init.lua b/itemframes/init.lua index 78c1d0cd..cfd77e19 100644 --- a/itemframes/init.lua +++ b/itemframes/init.lua @@ -100,7 +100,7 @@ local update_item = function(pos, node) local e = minetest.add_entity(pos,"itemframes:item") if node.name == "itemframes:frame" then local yaw = math.pi * 2 - node.param2 * math.pi / 2 - e:setyaw(yaw) + e:set_yaw(yaw) end end end From d9c42344abeb7f0ab48580133b2ac1156a59b346 Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Sat, 27 Nov 2021 20:32:13 -0500 Subject: [PATCH 02/10] fix removing item with inv contents https://github.com/mt-mods/homedecor_modpack/issues/3 --- homedecor_bathroom/init.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/homedecor_bathroom/init.lua b/homedecor_bathroom/init.lua index 20e18ae2..c344bbdb 100644 --- a/homedecor_bathroom/init.lua +++ b/homedecor_bathroom/init.lua @@ -91,6 +91,10 @@ homedecor.register("medicine_cabinet", { node.name = "homedecor:medicine_cabinet_open" minetest.swap_node(pos, node) end, + can_dig = function(pos) + local inv = minetest.get_meta(pos):get_inventory("main") + return inv:is_empty("main") + end, infotext=S("Medicine cabinet"), inventory = { size=6, @@ -115,6 +119,10 @@ homedecor.register("medicine_cabinet_open", { node.name = "homedecor:medicine_cabinet" minetest.swap_node(pos, node) end, + can_dig = function(pos) + local inv = minetest.get_meta(pos):get_inventory("main") + return inv:is_empty("main") + end, }) -- "Sanitation" related From 32a32fa003a21089de37d3cf6418eb1cf9d4cb42 Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Sat, 27 Nov 2021 20:43:25 -0500 Subject: [PATCH 03/10] fix health expliot https://github.com/mt-mods/homedecor_modpack/issues/14 --- homedecor_seating/longsofas.lua | 1 - homedecor_seating/sofas.lua | 1 - 2 files changed, 2 deletions(-) diff --git a/homedecor_seating/longsofas.lua b/homedecor_seating/longsofas.lua index d696b26a..90099509 100644 --- a/homedecor_seating/longsofas.lua +++ b/homedecor_seating/longsofas.lua @@ -47,7 +47,6 @@ minetest.register_node(":lrfurn:longsofa", { end pos.y = pos.y-0.5 clicker:setpos(pos) - clicker:set_hp(20) return itemstack end }) diff --git a/homedecor_seating/sofas.lua b/homedecor_seating/sofas.lua index 43b26cfd..abc85c86 100644 --- a/homedecor_seating/sofas.lua +++ b/homedecor_seating/sofas.lua @@ -47,7 +47,6 @@ minetest.register_node(":lrfurn:sofa", { end pos.y = pos.y-0.5 clicker:setpos(pos) - clicker:set_hp(20) return itemstack end }) From 63ad77e2429faefb1c4ac9f900fe759015791134 Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Sat, 27 Nov 2021 20:51:47 -0500 Subject: [PATCH 04/10] make beds sleepable https://github.com/mt-mods/homedecor_modpack/issues/13 --- homedecor_bedroom/init.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/homedecor_bedroom/init.lua b/homedecor_bedroom/init.lua index dbf12566..aea1f8ca 100644 --- a/homedecor_bedroom/init.lua +++ b/homedecor_bedroom/init.lua @@ -31,7 +31,7 @@ local kbed_cbox = { } --- local bed_on_rightclick = minetest.registered_nodes["beds:bed"].on_rightclick +local bed_on_rightclick = minetest.registered_nodes["beds:bed"].on_rightclick homedecor.register("bed_regular", { mesh = "homedecor_bed_regular.obj", @@ -67,9 +67,9 @@ homedecor.register("bed_regular", { if itemname == "homedecor:bed_regular" then homedecor.bed_expansion(pos, clicker, itemstack, pointed_thing, true) return itemstack --- else --- bed_on_rightclick(pos, node, clicker) --- return itemstack + else + bed_on_rightclick(pos, node, clicker) + return itemstack end end }) @@ -96,10 +96,10 @@ homedecor.register("bed_extended", { homedecor.unextend_bed(pos) end, on_dig = unifieddyes.on_dig, --- on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) --- bed_on_rightclick(pos, node, clicker) --- return itemstack --- end, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + bed_on_rightclick(pos, node, clicker) + return itemstack + end, drop = "homedecor:bed_regular" }) @@ -133,10 +133,10 @@ homedecor.register("bed_kingsize", { end end, on_dig = unifieddyes.on_dig, --- on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) --- bed_on_rightclick(pos, node, clicker) --- return itemstack --- end, + on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) + bed_on_rightclick(pos, node, clicker) + return itemstack + end, }) for w, d in pairs({ ["mahogany"] = S("mahogany"), ["oak"] = S("oak") }) do From 21ae9f8c17797affea51eab16564d2b3a44a1f32 Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Sat, 27 Nov 2021 23:43:59 -0500 Subject: [PATCH 05/10] drop stairs api support and fix use_texture_alpha for stairs --- building_blocks/node_stairs.lua | 59 +++++---------------------------- 1 file changed, 9 insertions(+), 50 deletions(-) diff --git a/building_blocks/node_stairs.lua b/building_blocks/node_stairs.lua index bfdabdf2..07cbe223 100644 --- a/building_blocks/node_stairs.lua +++ b/building_blocks/node_stairs.lua @@ -1,77 +1,48 @@ local S = minetest.get_translator("building_blocks") -local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"} - local function building_blocks_stairs(nodename, def) minetest.register_node(nodename, def) - if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then + if minetest.get_modpath("moreblocks") then local mod, name = nodename:match("(.*):(.*)") - minetest.register_alias(mod .. ":slab_" .. name, "stairs:slab_" .. name) - minetest.register_alias(mod .. ":stair_" .. name, "stairs:stair_" .. name) - local stairs_groups = {} - for _, groupname in ipairs(stairs_groups_names) do - stairs_groups[groupname] = def.groups[groupname] - end + stairsplus:register_all(mod, name, nodename, def) - if minetest.get_modpath("moreblocks") then - stairsplus:register_all( - mod, - name, - nodename, - { - description = def.description, - tiles = def.tiles, - groups = stairs_groups, - sounds = def.sounds, - } - ) - else - stairs.register_stair_and_slab(name,nodename, - stairs_groups, - def.tiles, - def.stair_desc, - def.slab_desc, - def.sounds - --FIXME: Missing descriptions for Inner and Outer stairs - -- See https://github.com/minetest/minetest_game/pull/2584 - ) - end + minetest.register_alias("stairs:slab_" .. name, mod .. ":slab_" .. name) + minetest.register_alias("stairs:stair_" .. name, mod .. ":stair_" .. name) + minetest.register_alias("stairs:stair_inner_" .. name, mod .. ":stair_" .. name .. "_inner") + minetest.register_alias("stairs:stair_outer_" .. name, mod .. ":stair_" .. name .. "_outer") end end building_blocks_stairs("building_blocks:grate", { drawtype = "glasslike", description = S("Grate"), - stair_desc = S("Grate Stair"), - slab = S("Grate Slab"), tiles = {"building_blocks_grate.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = true, + use_texture_alpha = "clip", groups = {cracky=1}, sounds = default.node_sound_metal_defaults(), }) building_blocks_stairs("building_blocks:smoothglass", { drawtype = "glasslike", description = S("Streak Free Glass"), - stair_desc = S("Streak Free Glass Stair"), - slab_desc = S("Streak Free Glass Slab"), tiles = {"building_blocks_sglass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = true, + use_texture_alpha = "clip", groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3}, sounds = default.node_sound_glass_defaults(), }) building_blocks_stairs("building_blocks:woodglass", { drawtype = "glasslike", description = S("Wood Framed Glass"), - stair_desc = S("Wood Framed Glass Stair"), - slab_desc = S("Wood Framed Glass Slab"), tiles = {"building_blocks_wglass.png"}, paramtype = "light", sunlight_propagates = true, is_ground_content = true, + use_texture_alpha = "clip", groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3}, sounds = default.node_sound_glass_defaults(), }) @@ -79,8 +50,6 @@ building_blocks_stairs("building_blocks:woodglass", { building_blocks_stairs("building_blocks:Adobe", { tiles = {"building_blocks_Adobe.png"}, description = S("Adobe"), - stair_desc = S("Adobe Stair"), - slab_desc = S("Adobe Slab"), is_ground_content = true, groups = {crumbly=3}, sounds = default.node_sound_stone_defaults(), @@ -88,8 +57,6 @@ building_blocks_stairs("building_blocks:Adobe", { building_blocks_stairs("building_blocks:fakegrass", { tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"}, description = S("Fake Grass"), - stair_desc = S("Fake Grass Stair"), - slab_desc = S("Fake Grass Slab"), is_ground_content = true, groups = {crumbly=3}, sounds = default.node_sound_dirt_defaults({ @@ -100,8 +67,6 @@ building_blocks_stairs("building_blocks:hardwood", { tiles = {"building_blocks_hardwood.png"}, is_ground_content = true, description = S("Hardwood"), - stair_desc = S("Hardwood Stair"), - slab_desc = S("Hardwood Slab"), groups = {choppy=1,flammable=1}, sounds = default.node_sound_wood_defaults(), }) @@ -109,15 +74,11 @@ building_blocks_stairs("building_blocks:Roofing", { tiles = {"building_blocks_Roofing.png"}, is_ground_content = true, description = S("Roof block"), - stair_desc = S("Roof block Stair"), - slab_desc = S("Roof block Slab"), groups = {snappy=3}, sounds = default.node_sound_stone_defaults(), }) building_blocks_stairs("building_blocks:Tar", { description = S("Tar"), - stair_desc = S("Tar Stair"), - slab_desc = S("Tar Slab"), tiles = {"building_blocks_tar.png"}, is_ground_content = true, groups = {crumbly=1, tar_block = 1}, @@ -125,8 +86,6 @@ building_blocks_stairs("building_blocks:Tar", { }) building_blocks_stairs("building_blocks:Marble", { description = S("Marble"), - stair_desc = S("Marble Stair"), - slab_desc = S("Marble Slab"), tiles = {"building_blocks_marble.png"}, is_ground_content = true, groups = {cracky=3, marble = 1}, From d68e90f017bb28294d420687d336af1e0d281f4f Mon Sep 17 00:00:00 2001 From: nixnoxus <87639406+nixnoxus@users.noreply.github.com> Date: Fri, 4 Feb 2022 00:40:38 +0100 Subject: [PATCH 06/10] add `hopper` support (#18) --- homedecor_common/furnaces.lua | 6 ++++-- homedecor_common/inventory.lua | 24 ++++++++++++++++++++++++ homedecor_common/mod.conf | 2 +- homedecor_common/registration.lua | 2 ++ 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/homedecor_common/furnaces.lua b/homedecor_common/furnaces.lua index 86e54015..f0f7a2d1 100644 --- a/homedecor_common/furnaces.lua +++ b/homedecor_common/furnaces.lua @@ -148,7 +148,8 @@ function homedecor.register_furnace(name, furnacedef) can_dig = furnace_can_dig, allow_metadata_inventory_put = furnace_allow_put, allow_metadata_inventory_move = furnace_allow_move, - inventory = { lockable = true } + inventory = { lockable = true }, + is_furnace = true } local def_active = { @@ -162,7 +163,8 @@ function homedecor.register_furnace(name, furnacedef) can_dig = furnace_can_dig, allow_metadata_inventory_put = furnace_allow_put, allow_metadata_inventory_move = furnace_allow_move, - inventory = { lockable = true } + inventory = { lockable = true }, + is_furnace = true } if furnacedef.extra_nodedef_fields then diff --git a/homedecor_common/inventory.lua b/homedecor_common/inventory.lua index 30e4c2cb..94956c68 100644 --- a/homedecor_common/inventory.lua +++ b/homedecor_common/inventory.lua @@ -1,5 +1,12 @@ local S = minetest.get_translator("homedecor_common") +local has_hopper = minetest.get_modpath("hopper") +local has_safe_hopper = has_hopper and + -- mod from https://github.com/minetest-mods/hopper respects the owner + (hopper.neighbors or + -- mod from https://notabug.org/TenPlus1/hopper respects the owner since 20220123 + (hopper.version and hopper.version >= "20220123")) + local default_can_dig = function(pos,player) local meta = minetest.get_meta(pos) return meta:get_inventory():is_empty("main") @@ -97,6 +104,23 @@ function homedecor.handle_inventory(name, def, original_def) end local locked = inventory.locked + + if has_hopper and (not locked or has_safe_hopper) then + if inventory.size then + hopper:add_container({ + {"top", "homedecor:"..name, "main"}, + {"bottom", "homedecor:"..name, "main"}, + {"side", "homedecor:"..name, "main"}, + }) + elseif original_def.is_furnace then + hopper:add_container({ + {"top", "homedecor:"..name, "dst"}, + {"bottom", "homedecor:"..name, "src"}, + {"side", "homedecor:"..name, "fuel"}, + }) + end + end + if locked then local after_place_node = def.after_place_node def.after_place_node = function(pos, placer) diff --git a/homedecor_common/mod.conf b/homedecor_common/mod.conf index ab7c4320..1a62348c 100644 --- a/homedecor_common/mod.conf +++ b/homedecor_common/mod.conf @@ -1,4 +1,4 @@ name = homedecor_common description = Homedecor mod: common depends = default, creative -optional_depends = screwdriver +optional_depends = screwdriver, hopper diff --git a/homedecor_common/registration.lua b/homedecor_common/registration.lua index f31eee0d..04f5ab38 100644 --- a/homedecor_common/registration.lua +++ b/homedecor_common/registration.lua @@ -6,6 +6,8 @@ local placeholder_node = "homedecor:expansion_placeholder" function homedecor.register(name, original_def) local def = table.copy(original_def) + def.is_furnace = nil + def.drawtype = def.drawtype or (def.mesh and "mesh") or (def.node_box and "nodebox") From 0c2271fa46d02bbe1462d9fc326844a7c64113cb Mon Sep 17 00:00:00 2001 From: wsor4035 <24964441+wsor4035@users.noreply.github.com> Date: Mon, 7 Feb 2022 08:18:17 -0500 Subject: [PATCH 07/10] fixes warning spam (#20) * fix fake fire warnings * fix hd 3d extras warnings * fix hd climate control warnings * fix hd clocks warnings * fix hd cobweb warnings * fix hd doors/gates warnings * fix hd exterior warnings * fix hd fences warnings * fix hd gastronomy warnings * fix hd kitchen missing dependency * fix hd office warnings * fix hd roofing warnings * fix hd table warnings * fix hd trash cans warnings * fix hd wardrobe warnings * remove legacy hack --- fake_fire/init.lua | 1 + fake_fire/mod.conf | 2 +- homedecor_3d_extras/init.lua | 6 +++--- homedecor_climate_control/init.lua | 2 ++ homedecor_clocks/init.lua | 1 + homedecor_cobweb/init.lua | 2 ++ homedecor_doors_and_gates/init.lua | 6 +++--- homedecor_exterior/init.lua | 5 +++++ homedecor_fences/init.lua | 10 ++++++++++ homedecor_gastronomy/init.lua | 2 ++ homedecor_kitchen/mod.conf | 2 +- homedecor_office/init.lua | 1 + homedecor_roofing/init.lua | 3 ++- homedecor_tables/coffeetable.lua | 1 + homedecor_tables/endtable.lua | 1 + homedecor_tables/misc.lua | 3 +++ homedecor_trash_cans/init.lua | 1 + homedecor_wardrobe/init.lua | 2 +- 18 files changed, 41 insertions(+), 10 deletions(-) diff --git a/fake_fire/init.lua b/fake_fire/init.lua index 21f82cc0..660bd0e3 100644 --- a/fake_fire/init.lua +++ b/fake_fire/init.lua @@ -179,6 +179,7 @@ minetest.register_node("fake_fire:fancy_fire", { mesh = "fancy_fire.obj", paramtype = "light", paramtype2 = "facedir", + use_texture_alpha = "clip", groups = {oddly_breakable_by_hand=3, flammable=0}, sunlight_propagates = true, light_source = 13, diff --git a/fake_fire/mod.conf b/fake_fire/mod.conf index c3e56ba2..39f9dd45 100644 --- a/fake_fire/mod.conf +++ b/fake_fire/mod.conf @@ -1,2 +1,2 @@ name = fake_fire -depends = default +depends = default, basic_materials diff --git a/homedecor_3d_extras/init.lua b/homedecor_3d_extras/init.lua index 53d75545..263573f2 100644 --- a/homedecor_3d_extras/init.lua +++ b/homedecor_3d_extras/init.lua @@ -21,7 +21,7 @@ if minetest.get_modpath("vessels") then }, paramtype = "light", paramtype2 = "facedir", - use_texture_alpha = true + use_texture_alpha = "blend", }) local sbox = { @@ -35,7 +35,7 @@ if minetest.get_modpath("vessels") then tiles = {"homedecor_3d_vessels_shelf_glass.png"}, inventory_image = "homedecor_3d_vessels_glass_bottle_inv.png", wield_image = "homedecor_3d_vessels_glass_bottle_inv.png", - use_texture_alpha = true, + use_texture_alpha = "blend", selection_box = sbox }) @@ -54,7 +54,7 @@ if minetest.get_modpath("vessels") then tiles = {"homedecor_3d_vessels_shelf_glass.png"}, inventory_image = "homedecor_3d_vessels_drinking_glass_inv.png", wield_image = "homedecor_3d_vessels_drinking_glass_inv.png", - use_texture_alpha = true, + use_texture_alpha = "blend", selection_box = sbox }) end diff --git a/homedecor_climate_control/init.lua b/homedecor_climate_control/init.lua index cbb0aaa3..41834d28 100644 --- a/homedecor_climate_control/init.lua +++ b/homedecor_climate_control/init.lua @@ -10,6 +10,7 @@ homedecor.register("air_conditioner", { "default_glass.png" }, groups = { snappy = 3 }, + use_texture_alpha = "clip", sounds = default.node_sound_leaves_defaults(), selection_box = { type="regular" }, }) @@ -95,6 +96,7 @@ homedecor.register("ceiling_fan", { { -0.0625, 0.375, -0.0625, 0.0625, 0.5, 0.0625 } } }, + use_texture_alpha = "clip", groups = { snappy = 3 }, light_source = default.LIGHT_MAX-1, sounds = default.node_sound_glass_defaults(), diff --git a/homedecor_clocks/init.lua b/homedecor_clocks/init.lua index 8801e921..9474d1f2 100644 --- a/homedecor_clocks/init.lua +++ b/homedecor_clocks/init.lua @@ -88,6 +88,7 @@ homedecor.register("grandfather_clock", { "homedecor_grandfather_clock_face_edge.png", "homedecor_generic_metal_brass.png" }, + use_texture_alpha = "clip", inventory_image = "homedecor_grandfather_clock_inv.png", groups = { snappy = 3 }, selection_box = gf_cbox, diff --git a/homedecor_cobweb/init.lua b/homedecor_cobweb/init.lua index 2d5a6bbe..0e5b8fc2 100644 --- a/homedecor_cobweb/init.lua +++ b/homedecor_cobweb/init.lua @@ -30,6 +30,7 @@ minetest.register_node(":homedecor:cobweb_centered", { drawtype = "nodebox", tiles = { "homedecor_cobweb.png" }, inventory_image = "homedecor_cobweb.png", + use_texture_alpha = "clip", paramtype = "light", paramtype2 = "facedir", sunlight_propagates = true, @@ -59,6 +60,7 @@ minetest.register_node(":homedecor:cobweb_flat", { inventory_image = "homedecor_cobweb.png", paramtype = "light", paramtype2 = "facedir", + use_texture_alpha = "clip", sunlight_propagates = true, liquid_viscosity = 8, liquidtype = "source", diff --git a/homedecor_doors_and_gates/init.lua b/homedecor_doors_and_gates/init.lua index 0554db5e..951b2073 100644 --- a/homedecor_doors_and_gates/init.lua +++ b/homedecor_doors_and_gates/init.lua @@ -183,12 +183,11 @@ for _, door in ipairs(door_list) do if door.alpha then local def = table.copy(minetest.registered_nodes[nn_a]) - def.use_texture_alpha = true - def.mesh = "door_a.obj" -- leaving this out will break the _a model + def.use_texture_alpha = "blend" minetest.register_node(":"..nn_a, def) -- assignment when the override takes place def = table.copy(minetest.registered_nodes[nn_b]) - def.use_texture_alpha = true + def.use_texture_alpha = "blend" minetest.register_node(":"..nn_b, def) end @@ -307,6 +306,7 @@ for i, g in ipairs(gate_list) do description = gatedesc, tiles = tiles, paramtype = "light", + use_texture_alpha = "clip", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), paramtype2 = "facedir", diff --git a/homedecor_exterior/init.lua b/homedecor_exterior/init.lua index 3e4b1697..bfe92dbd 100644 --- a/homedecor_exterior/init.lua +++ b/homedecor_exterior/init.lua @@ -94,6 +94,7 @@ homedecor.register("lattice_"..name, { description = S("Garden Lattice (@1)", desc), tiles = {"homedecor_lattice"..texture}, inventory_image = "homedecor_lattice"..texture, + use_texture_alpha = "clip", groups = { snappy=3 }, node_box = { type = "fixed", @@ -121,6 +122,7 @@ homedecor.register("swing", { "homedecor_swing_top.png" }, inventory_image = "homedecor_swing_inv.png", + use_texture_alpha = "clip", groups = { snappy=3, oddly_breakable_by_hand=3 }, sounds = default.node_sound_wood_defaults(), walkable = false, @@ -219,6 +221,7 @@ homedecor.register("well", { }, inventory_image = "homedecor_well_inv.png", description = S("Water well"), + use_texture_alpha = "clip", groups = { snappy = 3 }, selection_box = homedecor.nodebox.slab_y(2), collision_box = homedecor.nodebox.slab_y(2), @@ -265,6 +268,7 @@ for color, color_loc in pairs(homedecor_exterior.shrub_colors) do tiles = {"homedecor_shrubbery_"..color..".png"}, paramtype = "light", is_ground_content = false, + use_texture_alpha = "clip", groups = {snappy=3, flammable=2}, sounds = default.node_sound_leaves_defaults(), }) @@ -280,6 +284,7 @@ for color, color_loc in pairs(homedecor_exterior.shrub_colors) do }, paramtype = "light", is_ground_content = false, + use_texture_alpha = "clip", groups = {snappy=3, flammable=2}, sounds = default.node_sound_leaves_defaults(), selection_box = shrub_cbox, diff --git a/homedecor_fences/init.lua b/homedecor_fences/init.lua index 7a0dccc4..c5226efe 100644 --- a/homedecor_fences/init.lua +++ b/homedecor_fences/init.lua @@ -35,6 +35,7 @@ homedecor.register("fence_picket", { "homedecor_fence_picket_backside.png", "homedecor_fence_picket.png" }, + use_texture_alpha = "clip", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.slab_z(-0.1), @@ -51,6 +52,7 @@ homedecor.register("fence_picket_corner", { "homedecor_fence_picket_backside.png", "homedecor_fence_picket.png", }, + use_texture_alpha = "clip", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.corner_xz(0.1, -0.1), @@ -67,6 +69,7 @@ homedecor.register("fence_picket_white", { "homedecor_fence_picket_white_backside.png", "homedecor_fence_picket_white.png" }, + use_texture_alpha = "clip", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.slab_z(-0.1), @@ -83,6 +86,7 @@ homedecor.register("fence_picket_corner_white", { "homedecor_fence_picket_white_backside.png", "homedecor_fence_picket_white.png", }, + use_texture_alpha = "clip", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.corner_xz(0.1, -0.1), @@ -152,6 +156,7 @@ homedecor.register("fence_barbed_wire", { description = S("Barbed Wire Fence"), mesh = "homedecor_fence_barbed_wire.obj", tiles = {"homedecor_fence_barbed_wire.png"}, + use_texture_alpha = "clip", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.slab_z(-0.125), @@ -162,6 +167,7 @@ homedecor.register("fence_barbed_wire_corner", { description = S("Barbed Wire Fence Corner"), mesh = "homedecor_fence_barbed_wire_corner.obj", tiles = { "homedecor_fence_barbed_wire.png" }, + use_texture_alpha = "clip", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.corner_xz(0.125, -0.125), @@ -179,6 +185,7 @@ homedecor.register("fence_chainlink", { "homedecor_fence_chainlink_fb.png", "homedecor_fence_chainlink_fb.png", }, + use_texture_alpha = "clip", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.slab_z(-0.125), @@ -197,6 +204,7 @@ homedecor.register("fence_chainlink_corner", { "homedecor_fence_chainlink_corner_front.png", "homedecor_fence_chainlink_corner_front.png", }, + use_texture_alpha = "clip", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.corner_xz(0.125, -0.125), @@ -213,6 +221,7 @@ homedecor.register("fence_wrought_iron_2", { "homedecor_fence_wrought_iron_2_fb.png", "homedecor_fence_wrought_iron_2_fb.png" }, + use_texture_alpha = "clip", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.slab_z(-0.08), @@ -240,6 +249,7 @@ homedecor.register("fence_wrought_iron_2_corner", { "homedecor_fence_corner_wrought_iron_2_sides.png^[transformFX", "homedecor_fence_corner_wrought_iron_2_sides.png" }, + use_texture_alpha = "clip", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = homedecor.nodebox.corner_xz(0.08, -0.08), diff --git a/homedecor_gastronomy/init.lua b/homedecor_gastronomy/init.lua index 4cc18b66..b71676b3 100644 --- a/homedecor_gastronomy/init.lua +++ b/homedecor_gastronomy/init.lua @@ -136,6 +136,7 @@ homedecor.register("toaster", { tiles = { "homedecor_toaster_sides.png" }, inventory_image = "homedecor_toaster_inv.png", walkable = false, + use_texture_alpha = "clip", groups = { snappy=3 }, node_box = { type = "fixed", @@ -165,6 +166,7 @@ homedecor.register("toaster_loaf", { "homedecor_toaster_sides.png" }, walkable = false, + use_texture_alpha = "clip", groups = { snappy=3, not_in_creative_inventory=1 }, node_box = { type = "fixed", diff --git a/homedecor_kitchen/mod.conf b/homedecor_kitchen/mod.conf index 22f97b2f..8de6943d 100644 --- a/homedecor_kitchen/mod.conf +++ b/homedecor_kitchen/mod.conf @@ -1,4 +1,4 @@ name = homedecor_kitchen description = Homedecor mod: kitchen -depends = homedecor_common, default, basic_materials, dye +depends = homedecor_common, default, basic_materials, dye, unifieddyes optional_depends = moreblocks, building_blocks, technic, bucket, screwdriver diff --git a/homedecor_office/init.lua b/homedecor_office/init.lua index e55c4bcb..c0fa573a 100644 --- a/homedecor_office/init.lua +++ b/homedecor_office/init.lua @@ -77,6 +77,7 @@ homedecor.register("calendar", { wall_bottom = { -4/16, -8/16, -8/16, 4/16, -5/16, 5/16 }, wall_top = { -4/16, 5/16, -8/16, 4/16, 8/16, 5/16 } }, + use_texture_alpha = "clip", groups = {choppy=2,attached_node=1}, legacy_wallmounted = true, sounds = default.node_sound_defaults(), diff --git a/homedecor_roofing/init.lua b/homedecor_roofing/init.lua index 3c88deaf..0f600d4b 100644 --- a/homedecor_roofing/init.lua +++ b/homedecor_roofing/init.lua @@ -20,7 +20,7 @@ minetest.register_node(":homedecor:skylight_frosted", { tiles = { "homedecor_skylight_frosted.png" }, wield_image = "homedecor_skylight_frosted.png", inventory_image = "homedecor_skylight_frosted_inv.png", - use_texture_alpha = true, + use_texture_alpha = "blend", groups = { snappy = 3 }, paramtype = "light", sounds = default.node_sound_glass_defaults(), @@ -134,6 +134,7 @@ homedecor_roofing.register_slope = function(modname, subname, recipeitem, groups paramtype2 = "facedir", selection_box = slope_cbox, collision_box = slope_cbox, + use_texture_alpha = "blend", groups = groups, on_place = minetest.rotate_node, sounds = default.node_sound_wood_defaults() diff --git a/homedecor_tables/coffeetable.lua b/homedecor_tables/coffeetable.lua index 3e73e664..fd9fc649 100644 --- a/homedecor_tables/coffeetable.lua +++ b/homedecor_tables/coffeetable.lua @@ -57,6 +57,7 @@ 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}, sounds = default.node_sound_wood_defaults(), node_box = { diff --git a/homedecor_tables/endtable.lua b/homedecor_tables/endtable.lua index d28b5c4b..61af7ece 100644 --- a/homedecor_tables/endtable.lua +++ b/homedecor_tables/endtable.lua @@ -15,6 +15,7 @@ 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}, sounds = default.node_sound_wood_defaults(), node_box = { diff --git a/homedecor_tables/misc.lua b/homedecor_tables/misc.lua index de062240..6fa331db 100644 --- a/homedecor_tables/misc.lua +++ b/homedecor_tables/misc.lua @@ -34,6 +34,7 @@ for _, t in ipairs(leg_materials) do inventory_image = "homedecor_table_legs_"..name..".png", wield_image = "homedecor_table_legs_"..name..".png", walkable = false, + use_texture_alpha = "blend", groups = {snappy=3}, sounds = default.node_sound_wood_defaults(), selection_box = { @@ -76,6 +77,7 @@ for i, mat in ipairs(tabletop_materials) do 'homedecor_blanktile.png', }, wield_image = 'homedecor_'..m..'_table_'..shape..'_inv.png', + use_texture_alpha = "blend", groups = { snappy = 3 }, sounds = s, selection_box = tables_cbox, @@ -111,6 +113,7 @@ for i, mat in ipairs(tabletop_materials) do 'homedecor_'..m..'_table_edges.png', "homedecor_table_legs_"..leg_mat..".png", }, + use_texture_alpha = "blend", groups = { snappy = 3 }, sounds = s, }) diff --git a/homedecor_trash_cans/init.lua b/homedecor_trash_cans/init.lua index 092f4f92..63e70ee7 100644 --- a/homedecor_trash_cans/init.lua +++ b/homedecor_trash_cans/init.lua @@ -61,6 +61,7 @@ homedecor.register("trash_can", { tiles = { "homedecor_trash_can.png" }, inventory_image = "homedecor_trash_can_inv.png", description = S("Small Trash Can"), + use_texture_alpha = "clip", groups = {snappy=3}, selection_box = trash_cbox, collision_box = trash_cbox, diff --git a/homedecor_wardrobe/init.lua b/homedecor_wardrobe/init.lua index c7d279c0..ae5eb461 100644 --- a/homedecor_wardrobe/init.lua +++ b/homedecor_wardrobe/init.lua @@ -173,7 +173,7 @@ if not skinsdb_mod_path then -- If not managed by skinsdb minetest.register_on_joinplayer(function(player) - local skin = player:get_attribute("homedecor:player_skin") + local skin = player:get_meta():get("homedecor:player_skin") if skin and skin ~= "" then From 16bcc35ba28c5787a2742e2f965c83c259d3ac71 Mon Sep 17 00:00:00 2001 From: wsor4035 <24964441+wsor4035@users.noreply.github.com> Date: Thu, 10 Feb 2022 20:26:41 -0500 Subject: [PATCH 08/10] remove legacy files --- bower.json | 19 ------------------- modpack.txt | 0 2 files changed, 19 deletions(-) delete mode 100644 bower.json delete mode 100644 modpack.txt diff --git a/bower.json b/bower.json deleted file mode 100644 index 2a5379c8..00000000 --- a/bower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "homedecor_modpack", - "description": "This mod adds a whole bunch of new items to Minetest suitable for decorating inside and outside a home.", - "keywords": [ - "building", - "cosmetic", - "homedecor modpack", - "homedecor_modpack" - ], - "homepage": "http://daconcepts.com/vanessa/hobbies/minetest/homedecor-crafting-guide/homedecor-craft-guide.html", - "project": "https://github.com/minetest-mods/homedecor_modpack", - "forum": "http://forum.minetest.net/viewtopic.php?f=11&t=2041", - "screenshots": [ - "http://daconcepts.com/vanessa/hobbies/minetest/screenshots/homedecor1.png" - ], - "authors": [ - "VanessaE" - ] -} \ No newline at end of file diff --git a/modpack.txt b/modpack.txt deleted file mode 100644 index e69de29b..00000000 From 769e14fd118ea0c328a8335120f74e88c79ace4b Mon Sep 17 00:00:00 2001 From: wsor4035 <24964441+wsor4035@users.noreply.github.com> Date: Fri, 11 Feb 2022 15:44:45 -0500 Subject: [PATCH 09/10] refactor doors code (#21) --- homedecor_doors_and_gates/init.lua | 221 ++++++------------ .../models/homedecor_door_closet_a.obj | 0 .../models/homedecor_door_closet_b.obj | 0 .../models/homedecor_door_fancy_a.obj | 0 .../models/homedecor_door_fancy_b.obj | 0 .../models/homedecor_door_french_a.obj | 0 .../models/homedecor_door_french_b.obj | 0 .../models/homedecor_door_wood_glass_3_a.obj | 0 .../models/homedecor_door_wood_glass_3_b.obj | 0 .../models/homedecor_door_wrought_iron_a.obj | 0 .../models/homedecor_door_wrought_iron_b.obj | 0 11 files changed, 75 insertions(+), 146 deletions(-) rename {homedecor_3d_extras => homedecor_doors_and_gates}/models/homedecor_door_closet_a.obj (100%) rename {homedecor_3d_extras => homedecor_doors_and_gates}/models/homedecor_door_closet_b.obj (100%) rename {homedecor_3d_extras => homedecor_doors_and_gates}/models/homedecor_door_fancy_a.obj (100%) rename {homedecor_3d_extras => homedecor_doors_and_gates}/models/homedecor_door_fancy_b.obj (100%) rename {homedecor_3d_extras => homedecor_doors_and_gates}/models/homedecor_door_french_a.obj (100%) rename {homedecor_3d_extras => homedecor_doors_and_gates}/models/homedecor_door_french_b.obj (100%) rename {homedecor_3d_extras => homedecor_doors_and_gates}/models/homedecor_door_wood_glass_3_a.obj (100%) rename {homedecor_3d_extras => homedecor_doors_and_gates}/models/homedecor_door_wood_glass_3_b.obj (100%) rename {homedecor_3d_extras => homedecor_doors_and_gates}/models/homedecor_door_wrought_iron_a.obj (100%) rename {homedecor_3d_extras => homedecor_doors_and_gates}/models/homedecor_door_wrought_iron_b.obj (100%) diff --git a/homedecor_doors_and_gates/init.lua b/homedecor_doors_and_gates/init.lua index 951b2073..8d4de28e 100644 --- a/homedecor_doors_and_gates/init.lua +++ b/homedecor_doors_and_gates/init.lua @@ -4,208 +4,137 @@ local S = minetest.get_translator("homedecor_doors_and_gates") local mesecons_mp = minetest.get_modpath("mesecons") homedecor_doors_and_gates = {} --- new doors using minetest_game doors API - local door_list = { { name = "wood_plain", description = S("Plain Wooden Door"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = { - main = default.node_sound_wood_defaults(), - open = "homedecor_door_open", - close = "homedecor_door_close", - } + sounds = default.node_sound_wood_defaults(), + sound_open = "homedecor_door_open", + sound_close = "homedecor_door_close", }, - { name = "exterior_fancy", description = S("Fancy Wood/Glass Door"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = { - main = default.node_sound_wood_defaults(), - open = "homedecor_door_open", - close = "homedecor_door_close", - }, - backface = true, - alpha = true, - custom_model = "homedecor_door_fancy" + sounds = default.node_sound_wood_defaults(), + sound_open = "homedecor_door_open", + sound_close = "homedecor_door_close", + mesh = "homedecor_door_fancy.obj" }, - { name = "french_oak", description = S("French door, Oak-colored"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = { - main = default.node_sound_glass_defaults(), - }, - backface = true, - alpha = true, - custom_model = "homedecor_door_french" + sounds = default.node_sound_glass_defaults(), + mesh = "homedecor_door_french.obj" }, - { name = "french_mahogany", description = S("French door, Mahogany-colored"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = { - main = default.node_sound_glass_defaults(), - }, - backface = true, - alpha = true, - custom_model = "homedecor_door_french" + sounds = default.node_sound_glass_defaults(), + mesh = "homedecor_door_french.obj" }, - { name = "french_white", description = S("French door, White"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = { - main = default.node_sound_glass_defaults(), - }, - backface = true, - alpha = true, - custom_model = "homedecor_door_french" + sounds = default.node_sound_glass_defaults(), + mesh = "homedecor_door_french.obj" }, - { name = "basic_panel", description = S("Basic white panel Door"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = { - main = default.node_sound_wood_defaults(), - open = "homedecor_door_open", - close = "homedecor_door_close", - } + sounds = default.node_sound_wood_defaults(), + sound_open = "homedecor_door_open", + sound_close = "homedecor_door_close", }, - { name = "wrought_iron", description = S("Wrought Iron Gate/Door"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = { - main = default.node_sound_metal_defaults(), - open = "doors_steel_door_open", - close = "doors_steel_door_close", - }, - backface = true, - custom_model = "homedecor_door_wrought_iron" + sounds = default.node_sound_metal_defaults(), + sound_open = "doors_steel_door_open", + sound_close = "doors_steel_door_close", + mesh = "homedecor_door_wrought_iron.obj" }, - { name = "carolina", description = S("Wooden Carolina door"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = { - main = default.node_sound_wood_defaults(), - open = "homedecor_door_open", - close = "homedecor_door_close", - }, - backface = true, - alpha = true + sounds = default.node_sound_wood_defaults(), + sound_open = "homedecor_door_open", + sound_close = "homedecor_door_close", }, - { name = "woodglass", description = S("Wooden door with glass insert, type 3"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = { - main = default.node_sound_wood_defaults(), - open = "homedecor_door_open", - close = "homedecor_door_close", - }, - backface = true, - alpha = true, - custom_model = "homedecor_door_wood_glass_3" + sounds = default.node_sound_wood_defaults(), + sound_open = "homedecor_door_open", + sound_close = "homedecor_door_close", + mesh = "homedecor_door_wood_glass_3.obj" }, - { name = "closet_mahogany", description = S("Mahogany Closet Door"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = { - main = default.node_sound_wood_defaults(), - }, - custom_model = "homedecor_door_closet" + sounds = default.node_sound_wood_defaults(), + mesh = "homedecor_door_closet.obj" }, - { name = "closet_oak", description = S("Oak Closet Door"), - groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, - sounds = { - main = default.node_sound_wood_defaults(), - }, - custom_model = "homedecor_door_closet" + sounds = default.node_sound_wood_defaults(), + mesh = "homedecor_door_closet" }, } local old_doors = {} -local mesecons --- This part blatantly copied from Mesecons, and modified :-) -if mesecons_mp then - mesecons = { - effector = { - action_on = function(pos, node) - local door = doors.get(pos) - if door then - door:open() - end - end, - action_off = function(pos, node) - local door = doors.get(pos) - if door then - door:close() - end - end, - rules = mesecon.rules.pplate - } +local door_types = {"_a", "_b", "_c", "_d"} + +local function generate_door(def) + local default_settings = { + tiles = {{ name = "homedecor_door_" .. def.name .. ".png", backface_culling = true }}, + inventory_image = "homedecor_door_" .. def.name .. "_inv.png", + use_texture_alpha = "blend", + groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, + mesecons = { + effector = { + action_on = function(pos, node) + local door = doors.get(pos) + if door then door:open() end + end, + action_off = function(pos, node) + local door = doors.get(pos) + if door then door:close() end + end, + rules = mesecon and mesecon.rules.pplate or nil + } + }, } + + for k, v in pairs(default_settings) do + if not def[k] then def[k] = v end + end + + def.name = nil + + return def end -local hd_3d = minetest.get_modpath("homedecor_3d_extras") - for _, door in ipairs(door_list) do - doors.register("homedecor_"..door.name, { - tiles = {{ name = "homedecor_door_"..door.name..".png", backface_culling = door.backface }}, - description = door.description, - inventory_image = "homedecor_door_"..door.name.."_inv.png", - groups = table.copy(door.groups), - sounds = door.sounds.main, - sound_open = door.sounds.open, - sound_close = door.sounds.close, - mesecons = mesecons - }) + local name = door.name + doors.register("homedecor_" .. name, generate_door(door)) - local nn_a = "doors:homedecor_"..door.name.."_a" - local nn_b = "doors:homedecor_"..door.name.."_b" - - if door.alpha then - local def = table.copy(minetest.registered_nodes[nn_a]) - def.use_texture_alpha = "blend" - minetest.register_node(":"..nn_a, def) -- assignment when the override takes place - - def = table.copy(minetest.registered_nodes[nn_b]) - def.use_texture_alpha = "blend" - minetest.register_node(":"..nn_b, def) + --hack to get around doors not allowing custom meshes + if door.mesh then + for _, v in pairs(door_types) do + minetest.override_item("doors:homedecor_" .. name .. v, { + mesh = door.mesh + }) + end end - if door.custom_model and hd_3d then - def = table.copy(minetest.registered_nodes[nn_a]) - def.mesh = door.custom_model.."_a.obj" - minetest.register_node(":"..nn_a, def) + --compatibility + old_doors[#old_doors + 1] = "homedecor:door_"..name.."_left" + old_doors[#old_doors + 1] = "homedecor:door_"..name.."_right" - def = table.copy(minetest.registered_nodes[nn_b]) - def.mesh = door.custom_model.."_b.obj" - minetest.register_node(":"..nn_b, def) - end - - old_doors[#old_doors + 1] = "homedecor:door_"..door.name.."_left" - old_doors[#old_doors + 1] = "homedecor:door_"..door.name.."_right" - - minetest.register_alias("doors:"..door.name.."_a", "doors:homedecor_"..door.name.."_a") - minetest.register_alias("doors:"..door.name.."_b", "doors:homedecor_"..door.name.."_b") + minetest.register_alias("doors:"..name.."_a", "doors:homedecor_"..name.."_a") + minetest.register_alias("doors:"..name.."_b", "doors:homedecor_"..name.."_b") end -- Gates @@ -769,4 +698,4 @@ minetest.register_lbm({ end minetest.set_node({x=pos.x, y=pos.y+1, z=pos.z}, {name = "doors:hidden"}) end -}) +}) \ No newline at end of file diff --git a/homedecor_3d_extras/models/homedecor_door_closet_a.obj b/homedecor_doors_and_gates/models/homedecor_door_closet_a.obj similarity index 100% rename from homedecor_3d_extras/models/homedecor_door_closet_a.obj rename to homedecor_doors_and_gates/models/homedecor_door_closet_a.obj diff --git a/homedecor_3d_extras/models/homedecor_door_closet_b.obj b/homedecor_doors_and_gates/models/homedecor_door_closet_b.obj similarity index 100% rename from homedecor_3d_extras/models/homedecor_door_closet_b.obj rename to homedecor_doors_and_gates/models/homedecor_door_closet_b.obj diff --git a/homedecor_3d_extras/models/homedecor_door_fancy_a.obj b/homedecor_doors_and_gates/models/homedecor_door_fancy_a.obj similarity index 100% rename from homedecor_3d_extras/models/homedecor_door_fancy_a.obj rename to homedecor_doors_and_gates/models/homedecor_door_fancy_a.obj diff --git a/homedecor_3d_extras/models/homedecor_door_fancy_b.obj b/homedecor_doors_and_gates/models/homedecor_door_fancy_b.obj similarity index 100% rename from homedecor_3d_extras/models/homedecor_door_fancy_b.obj rename to homedecor_doors_and_gates/models/homedecor_door_fancy_b.obj diff --git a/homedecor_3d_extras/models/homedecor_door_french_a.obj b/homedecor_doors_and_gates/models/homedecor_door_french_a.obj similarity index 100% rename from homedecor_3d_extras/models/homedecor_door_french_a.obj rename to homedecor_doors_and_gates/models/homedecor_door_french_a.obj diff --git a/homedecor_3d_extras/models/homedecor_door_french_b.obj b/homedecor_doors_and_gates/models/homedecor_door_french_b.obj similarity index 100% rename from homedecor_3d_extras/models/homedecor_door_french_b.obj rename to homedecor_doors_and_gates/models/homedecor_door_french_b.obj diff --git a/homedecor_3d_extras/models/homedecor_door_wood_glass_3_a.obj b/homedecor_doors_and_gates/models/homedecor_door_wood_glass_3_a.obj similarity index 100% rename from homedecor_3d_extras/models/homedecor_door_wood_glass_3_a.obj rename to homedecor_doors_and_gates/models/homedecor_door_wood_glass_3_a.obj diff --git a/homedecor_3d_extras/models/homedecor_door_wood_glass_3_b.obj b/homedecor_doors_and_gates/models/homedecor_door_wood_glass_3_b.obj similarity index 100% rename from homedecor_3d_extras/models/homedecor_door_wood_glass_3_b.obj rename to homedecor_doors_and_gates/models/homedecor_door_wood_glass_3_b.obj diff --git a/homedecor_3d_extras/models/homedecor_door_wrought_iron_a.obj b/homedecor_doors_and_gates/models/homedecor_door_wrought_iron_a.obj similarity index 100% rename from homedecor_3d_extras/models/homedecor_door_wrought_iron_a.obj rename to homedecor_doors_and_gates/models/homedecor_door_wrought_iron_a.obj diff --git a/homedecor_3d_extras/models/homedecor_door_wrought_iron_b.obj b/homedecor_doors_and_gates/models/homedecor_door_wrought_iron_b.obj similarity index 100% rename from homedecor_3d_extras/models/homedecor_door_wrought_iron_b.obj rename to homedecor_doors_and_gates/models/homedecor_door_wrought_iron_b.obj From 694bfe5fe74b41a2a9b42f7e21d74ddf504ae1ec Mon Sep 17 00:00:00 2001 From: wsor4035 <24964441+wsor4035@users.noreply.github.com> Date: Mon, 14 Feb 2022 17:54:32 -0500 Subject: [PATCH 10/10] namespace plasmascreen and inbox (#22) --- {inbox => homedecor_inbox}/.luacheckrc | 2 +- {inbox => homedecor_inbox}/init.lua | 16 ++--- {inbox => homedecor_inbox}/locale/inbox.de.tr | 0 {inbox => homedecor_inbox}/locale/inbox.es.tr | 0 {inbox => homedecor_inbox}/locale/inbox.fr.tr | 0 {inbox => homedecor_inbox}/locale/inbox.ms.tr | 0 {inbox => homedecor_inbox}/locale/inbox.pt.tr | 0 .../locale/inbox.pt_BR.tr | 0 {inbox => homedecor_inbox}/locale/inbox.ru.tr | 0 .../locale/inbox.zh_CN.tr | 0 .../locale/template.txt | 0 {inbox => homedecor_inbox}/mod.conf | 2 +- .../models/homedecor_inbox_mailbox.obj | 0 .../textures/homedecor_inbox_grey_metal.png | Bin .../textures/homedecor_inbox_red_metal.png | Bin .../textures/homedecor_inbox_white_metal.png | Bin .../textures/homedecor_mailbox_inv.png | Bin .../.luacheckrc | 2 +- .../README.md | 0 .../init.lua | 57 +++++++++--------- .../locale/plasmascreen.de.tr | 0 .../locale/plasmascreen.es.tr | 0 .../locale/plasmascreen.fr.tr | 0 .../locale/plasmascreen.ms.tr | 0 .../locale/plasmascreen.pt.tr | 0 .../locale/plasmascreen.pt_BR.tr | 0 .../locale/plasmascreen.ru.tr | 0 .../locale/plasmascreen.zh_CN.tr | 0 .../locale/template.txt | 0 .../mod.conf | 2 +- .../models/homedecor_plasmascreen_tv.obj | 0 .../textures/homedecor_plasmascreen_back.png | Bin .../textures/homedecor_plasmascreen_case.png | Bin .../homedecor_plasmascreen_case_off.png | Bin .../homedecor_plasmascreen_screen_off.png | Bin .../homedecor_plasmascreen_tv_inv.png | Bin .../textures/homedecor_plasmascreen_video.png | Bin 37 files changed, 43 insertions(+), 38 deletions(-) rename {inbox => homedecor_inbox}/.luacheckrc (91%) rename {inbox => homedecor_inbox}/init.lua (91%) rename {inbox => homedecor_inbox}/locale/inbox.de.tr (100%) rename {inbox => homedecor_inbox}/locale/inbox.es.tr (100%) rename {inbox => homedecor_inbox}/locale/inbox.fr.tr (100%) rename {inbox => homedecor_inbox}/locale/inbox.ms.tr (100%) rename {inbox => homedecor_inbox}/locale/inbox.pt.tr (100%) rename {inbox => homedecor_inbox}/locale/inbox.pt_BR.tr (100%) rename {inbox => homedecor_inbox}/locale/inbox.ru.tr (100%) rename {inbox => homedecor_inbox}/locale/inbox.zh_CN.tr (100%) rename {inbox => homedecor_inbox}/locale/template.txt (100%) rename {inbox => homedecor_inbox}/mod.conf (74%) rename inbox/models/inbox_mailbox.obj => homedecor_inbox/models/homedecor_inbox_mailbox.obj (100%) rename inbox/textures/inbox_grey_metal.png => homedecor_inbox/textures/homedecor_inbox_grey_metal.png (100%) rename inbox/textures/inbox_red_metal.png => homedecor_inbox/textures/homedecor_inbox_red_metal.png (100%) rename inbox/textures/inbox_white_metal.png => homedecor_inbox/textures/homedecor_inbox_white_metal.png (100%) rename inbox/textures/mailbox_inv.png => homedecor_inbox/textures/homedecor_mailbox_inv.png (100%) rename {plasmascreen => homedecor_plasmascreen}/.luacheckrc (90%) rename {plasmascreen => homedecor_plasmascreen}/README.md (100%) rename {plasmascreen => homedecor_plasmascreen}/init.lua (80%) rename {plasmascreen => homedecor_plasmascreen}/locale/plasmascreen.de.tr (100%) rename {plasmascreen => homedecor_plasmascreen}/locale/plasmascreen.es.tr (100%) rename {plasmascreen => homedecor_plasmascreen}/locale/plasmascreen.fr.tr (100%) rename {plasmascreen => homedecor_plasmascreen}/locale/plasmascreen.ms.tr (100%) rename {plasmascreen => homedecor_plasmascreen}/locale/plasmascreen.pt.tr (100%) rename {plasmascreen => homedecor_plasmascreen}/locale/plasmascreen.pt_BR.tr (100%) rename {plasmascreen => homedecor_plasmascreen}/locale/plasmascreen.ru.tr (100%) rename {plasmascreen => homedecor_plasmascreen}/locale/plasmascreen.zh_CN.tr (100%) rename {plasmascreen => homedecor_plasmascreen}/locale/template.txt (100%) rename {plasmascreen => homedecor_plasmascreen}/mod.conf (75%) rename plasmascreen/models/plasmascreen_tv.obj => homedecor_plasmascreen/models/homedecor_plasmascreen_tv.obj (100%) rename plasmascreen/textures/plasmascreen_back.png => homedecor_plasmascreen/textures/homedecor_plasmascreen_back.png (100%) rename plasmascreen/textures/plasmascreen_case.png => homedecor_plasmascreen/textures/homedecor_plasmascreen_case.png (100%) rename plasmascreen/textures/plasmascreen_case_off.png => homedecor_plasmascreen/textures/homedecor_plasmascreen_case_off.png (100%) rename plasmascreen/textures/plasmascreen_screen_off.png => homedecor_plasmascreen/textures/homedecor_plasmascreen_screen_off.png (100%) rename plasmascreen/textures/plasmascreen_tv_inv.png => homedecor_plasmascreen/textures/homedecor_plasmascreen_tv_inv.png (100%) rename plasmascreen/textures/plasmascreen_video.png => homedecor_plasmascreen/textures/homedecor_plasmascreen_video.png (100%) diff --git a/inbox/.luacheckrc b/homedecor_inbox/.luacheckrc similarity index 91% rename from inbox/.luacheckrc rename to homedecor_inbox/.luacheckrc index 2ef25d14..0a057505 100644 --- a/inbox/.luacheckrc +++ b/homedecor_inbox/.luacheckrc @@ -12,7 +12,7 @@ read_globals = { "VoxelManip", "VoxelArea", "PseudoRandom", "ItemStack", "default", - "screwdriver", + "screwdriver", "homedecor", } globals = { diff --git a/inbox/init.lua b/homedecor_inbox/init.lua similarity index 91% rename from inbox/init.lua rename to homedecor_inbox/init.lua index 0ec889b8..1701dc51 100644 --- a/inbox/init.lua +++ b/homedecor_inbox/init.lua @@ -3,7 +3,7 @@ local S = minetest.get_translator("inbox") local inbox = {} minetest.register_craft({ - output ="inbox:empty", + output ="homedecor:inbox", recipe = { {"","default:steel_ingot",""}, {"default:steel_ingot","","default:steel_ingot"}, @@ -16,17 +16,17 @@ local mb_cbox = { fixed = { -5/16, -8/16, -8/16, 5/16, 2/16, 8/16 } } -minetest.register_node("inbox:empty", { +homedecor.register("inbox", { paramtype = "light", drawtype = "mesh", - mesh = "inbox_mailbox.obj", + mesh = "homedecor_inbox_mailbox.obj", description = S("Mailbox"), tiles = { - "inbox_red_metal.png", - "inbox_white_metal.png", - "inbox_grey_metal.png", + "homedecor_inbox_red_metal.png", + "homedecor_inbox_white_metal.png", + "homedecor_inbox_grey_metal.png", }, - inventory_image = "mailbox_inv.png", + inventory_image = "homedecor_mailbox_inv.png", selection_box = mb_cbox, collision_box = mb_cbox, paramtype2 = "facedir", @@ -105,6 +105,8 @@ minetest.register_node("inbox:empty", { end, }) +minetest.register_alias("inbox:empty", "homedecor:inbox") + function inbox.get_inbox_formspec(pos) local spos = pos.x .. "," .. pos.y .. "," ..pos.z local formspec = diff --git a/inbox/locale/inbox.de.tr b/homedecor_inbox/locale/inbox.de.tr similarity index 100% rename from inbox/locale/inbox.de.tr rename to homedecor_inbox/locale/inbox.de.tr diff --git a/inbox/locale/inbox.es.tr b/homedecor_inbox/locale/inbox.es.tr similarity index 100% rename from inbox/locale/inbox.es.tr rename to homedecor_inbox/locale/inbox.es.tr diff --git a/inbox/locale/inbox.fr.tr b/homedecor_inbox/locale/inbox.fr.tr similarity index 100% rename from inbox/locale/inbox.fr.tr rename to homedecor_inbox/locale/inbox.fr.tr diff --git a/inbox/locale/inbox.ms.tr b/homedecor_inbox/locale/inbox.ms.tr similarity index 100% rename from inbox/locale/inbox.ms.tr rename to homedecor_inbox/locale/inbox.ms.tr diff --git a/inbox/locale/inbox.pt.tr b/homedecor_inbox/locale/inbox.pt.tr similarity index 100% rename from inbox/locale/inbox.pt.tr rename to homedecor_inbox/locale/inbox.pt.tr diff --git a/inbox/locale/inbox.pt_BR.tr b/homedecor_inbox/locale/inbox.pt_BR.tr similarity index 100% rename from inbox/locale/inbox.pt_BR.tr rename to homedecor_inbox/locale/inbox.pt_BR.tr diff --git a/inbox/locale/inbox.ru.tr b/homedecor_inbox/locale/inbox.ru.tr similarity index 100% rename from inbox/locale/inbox.ru.tr rename to homedecor_inbox/locale/inbox.ru.tr diff --git a/inbox/locale/inbox.zh_CN.tr b/homedecor_inbox/locale/inbox.zh_CN.tr similarity index 100% rename from inbox/locale/inbox.zh_CN.tr rename to homedecor_inbox/locale/inbox.zh_CN.tr diff --git a/inbox/locale/template.txt b/homedecor_inbox/locale/template.txt similarity index 100% rename from inbox/locale/template.txt rename to homedecor_inbox/locale/template.txt diff --git a/inbox/mod.conf b/homedecor_inbox/mod.conf similarity index 74% rename from inbox/mod.conf rename to homedecor_inbox/mod.conf index c36bc793..d6a2322d 100644 --- a/inbox/mod.conf +++ b/homedecor_inbox/mod.conf @@ -1,3 +1,3 @@ -name = inbox +name = homedecor_inbox depends = default, homedecor_common optional_depends = screwdriver diff --git a/inbox/models/inbox_mailbox.obj b/homedecor_inbox/models/homedecor_inbox_mailbox.obj similarity index 100% rename from inbox/models/inbox_mailbox.obj rename to homedecor_inbox/models/homedecor_inbox_mailbox.obj diff --git a/inbox/textures/inbox_grey_metal.png b/homedecor_inbox/textures/homedecor_inbox_grey_metal.png similarity index 100% rename from inbox/textures/inbox_grey_metal.png rename to homedecor_inbox/textures/homedecor_inbox_grey_metal.png diff --git a/inbox/textures/inbox_red_metal.png b/homedecor_inbox/textures/homedecor_inbox_red_metal.png similarity index 100% rename from inbox/textures/inbox_red_metal.png rename to homedecor_inbox/textures/homedecor_inbox_red_metal.png diff --git a/inbox/textures/inbox_white_metal.png b/homedecor_inbox/textures/homedecor_inbox_white_metal.png similarity index 100% rename from inbox/textures/inbox_white_metal.png rename to homedecor_inbox/textures/homedecor_inbox_white_metal.png diff --git a/inbox/textures/mailbox_inv.png b/homedecor_inbox/textures/homedecor_mailbox_inv.png similarity index 100% rename from inbox/textures/mailbox_inv.png rename to homedecor_inbox/textures/homedecor_mailbox_inv.png diff --git a/plasmascreen/.luacheckrc b/homedecor_plasmascreen/.luacheckrc similarity index 90% rename from plasmascreen/.luacheckrc rename to homedecor_plasmascreen/.luacheckrc index 4002b90d..f65fce03 100644 --- a/plasmascreen/.luacheckrc +++ b/homedecor_plasmascreen/.luacheckrc @@ -11,7 +11,7 @@ read_globals = { "vector", "nodeupdate", "VoxelManip", "VoxelArea", "PseudoRandom", "ItemStack", - "screwdriver", + "screwdriver", "homedecor", } globals = { diff --git a/plasmascreen/README.md b/homedecor_plasmascreen/README.md similarity index 100% rename from plasmascreen/README.md rename to homedecor_plasmascreen/README.md diff --git a/plasmascreen/init.lua b/homedecor_plasmascreen/init.lua similarity index 80% rename from plasmascreen/init.lua rename to homedecor_plasmascreen/init.lua index 4f76bf41..a3df75b0 100644 --- a/plasmascreen/init.lua +++ b/homedecor_plasmascreen/init.lua @@ -2,9 +2,9 @@ local S = minetest.get_translator("plasmascreen") local sc_disallow = minetest.get_modpath("screwdriver") and screwdriver.disallow or nil -minetest.register_node("plasmascreen:stand", { +homedecor.register("tv_stand", { description = S("Plasma Screen TV Stand"), - tiles = {"plasmascreen_back.png"}, + tiles = {"homedecor_plasmascreen_back.png"}, paramtype = "light", paramtype2 = "facedir", drawtype = "nodebox", @@ -26,13 +26,6 @@ minetest.register_node("plasmascreen:stand", { groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2}, }) -minetest.register_alias("plasmascreen:screen1", "air") -minetest.register_alias("plasmascreen:screen2", "air") -minetest.register_alias("plasmascreen:screen3", "air") -minetest.register_alias("plasmascreen:screen4", "air") -minetest.register_alias("plasmascreen:screen5", "plasmascreen:tv") -minetest.register_alias("plasmascreen:screen6", "air") - local fdir_to_left = { { -1, 0 }, { 0, 1 }, @@ -95,13 +88,13 @@ local function checkwall(pos) return true end -minetest.register_node("plasmascreen:tv", { +homedecor.register("tv", { description = S("Plasma TV"), drawtype = "mesh", - mesh = "plasmascreen_tv.obj", + mesh = "homedecor_plasmascreen_tv.obj", tiles = { - "plasmascreen_case.png", - { name="plasmascreen_video.png", + "homedecor_plasmascreen_case.png", + { name="homedecor_plasmascreen_video.png", animation={ type="vertical_frames", aspect_w = 42, @@ -111,8 +104,8 @@ minetest.register_node("plasmascreen:tv", { } }, - inventory_image = "plasmascreen_tv_inv.png", - wield_image = "plasmascreen_tv_inv.png", + inventory_image = "homedecor_plasmascreen_tv_inv.png", + wield_image = "homedecor_plasmascreen_tv_inv.png", paramtype = "light", paramtype2 = "facedir", light_source = 10, @@ -127,20 +120,20 @@ minetest.register_node("plasmascreen:tv", { end end, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, {name = "plasmascreen:tv_off", param2 = node.param2}) + minetest.set_node(pos, {name = "homedecor:tv_off", param2 = node.param2}) end }) -minetest.register_node("plasmascreen:tv_off", { +homedecor.register("tv_off", { description = S("Plasma TV (off)"), drawtype = "mesh", - mesh = "plasmascreen_tv.obj", + mesh = "homedecor_plasmascreen_tv.obj", tiles = { - "plasmascreen_case_off.png", - "plasmascreen_screen_off.png", + "homedecor_plasmascreen_case_off.png", + "homedecor_plasmascreen_screen_off.png", }, - inventory_image = "plasmascreen_tv_inv.png", - wield_image = "plasmascreen_tv_inv.png", + inventory_image = "homedecor_plasmascreen_tv_inv.png", + wield_image = "homedecor_plasmascreen_tv_inv.png", paramtype = "light", paramtype2 = "facedir", light_source = 10, @@ -155,15 +148,15 @@ minetest.register_node("plasmascreen:tv_off", { end end, on_rightclick = function(pos, node, clicker, itemstack, pointed_thing) - minetest.set_node(pos, {name = "plasmascreen:tv", param2 = node.param2}) + minetest.set_node(pos, {name = "homedecor:tv", param2 = node.param2}) end, - drop = "plasmascreen:tv" + drop = "homedecor:tv" }) -- crafting recipes minetest.register_craft({ - output = "plasmascreen:tv", + output = "homedecor:tv", recipe = { {'default:glass', 'default:coal_lump', 'default:glass'}, {'default:steel_ingot', 'default:copper_ingot', 'default:steel_ingot'}, @@ -173,15 +166,25 @@ minetest.register_craft({ minetest.register_craft({ type = "shapeless", - output = "plasmascreen:tv", + output = "homedecor:tv", recipe = {'homedecor:television', 'homedecor:television'}, }) minetest.register_craft({ - output = "plasmascreen:stand", + output = "homedecor:tv_stand", recipe = { {'', '', ''}, {'', 'default:steel_ingot', ''}, {'group:stick', 'default:coal_lump', 'group:stick'}, } }) + +minetest.register_alias("plasmascreen:screen1", "air") +minetest.register_alias("plasmascreen:screen2", "air") +minetest.register_alias("plasmascreen:screen3", "air") +minetest.register_alias("plasmascreen:screen4", "air") +minetest.register_alias("plasmascreen:screen6", "air") +minetest.register_alias("plasmascreen:screen5", "homedecor:tv") +minetest.register_alias("plasmascreen:stand", "homedecor:tv_stand") +minetest.register_alias("plasmascreen:tv", "homedecor:tv") +minetest.register_alias("plasmascreen:tv_off", "homedecor:tv_off") \ No newline at end of file diff --git a/plasmascreen/locale/plasmascreen.de.tr b/homedecor_plasmascreen/locale/plasmascreen.de.tr similarity index 100% rename from plasmascreen/locale/plasmascreen.de.tr rename to homedecor_plasmascreen/locale/plasmascreen.de.tr diff --git a/plasmascreen/locale/plasmascreen.es.tr b/homedecor_plasmascreen/locale/plasmascreen.es.tr similarity index 100% rename from plasmascreen/locale/plasmascreen.es.tr rename to homedecor_plasmascreen/locale/plasmascreen.es.tr diff --git a/plasmascreen/locale/plasmascreen.fr.tr b/homedecor_plasmascreen/locale/plasmascreen.fr.tr similarity index 100% rename from plasmascreen/locale/plasmascreen.fr.tr rename to homedecor_plasmascreen/locale/plasmascreen.fr.tr diff --git a/plasmascreen/locale/plasmascreen.ms.tr b/homedecor_plasmascreen/locale/plasmascreen.ms.tr similarity index 100% rename from plasmascreen/locale/plasmascreen.ms.tr rename to homedecor_plasmascreen/locale/plasmascreen.ms.tr diff --git a/plasmascreen/locale/plasmascreen.pt.tr b/homedecor_plasmascreen/locale/plasmascreen.pt.tr similarity index 100% rename from plasmascreen/locale/plasmascreen.pt.tr rename to homedecor_plasmascreen/locale/plasmascreen.pt.tr diff --git a/plasmascreen/locale/plasmascreen.pt_BR.tr b/homedecor_plasmascreen/locale/plasmascreen.pt_BR.tr similarity index 100% rename from plasmascreen/locale/plasmascreen.pt_BR.tr rename to homedecor_plasmascreen/locale/plasmascreen.pt_BR.tr diff --git a/plasmascreen/locale/plasmascreen.ru.tr b/homedecor_plasmascreen/locale/plasmascreen.ru.tr similarity index 100% rename from plasmascreen/locale/plasmascreen.ru.tr rename to homedecor_plasmascreen/locale/plasmascreen.ru.tr diff --git a/plasmascreen/locale/plasmascreen.zh_CN.tr b/homedecor_plasmascreen/locale/plasmascreen.zh_CN.tr similarity index 100% rename from plasmascreen/locale/plasmascreen.zh_CN.tr rename to homedecor_plasmascreen/locale/plasmascreen.zh_CN.tr diff --git a/plasmascreen/locale/template.txt b/homedecor_plasmascreen/locale/template.txt similarity index 100% rename from plasmascreen/locale/template.txt rename to homedecor_plasmascreen/locale/template.txt diff --git a/plasmascreen/mod.conf b/homedecor_plasmascreen/mod.conf similarity index 75% rename from plasmascreen/mod.conf rename to homedecor_plasmascreen/mod.conf index ea247cfb..4f5edfc2 100644 --- a/plasmascreen/mod.conf +++ b/homedecor_plasmascreen/mod.conf @@ -1,3 +1,3 @@ -name = plasmascreen +name = homedecor_plasmascreen depends = default, homedecor_common, homedecor_electronics optional_depends = screwdriver diff --git a/plasmascreen/models/plasmascreen_tv.obj b/homedecor_plasmascreen/models/homedecor_plasmascreen_tv.obj similarity index 100% rename from plasmascreen/models/plasmascreen_tv.obj rename to homedecor_plasmascreen/models/homedecor_plasmascreen_tv.obj diff --git a/plasmascreen/textures/plasmascreen_back.png b/homedecor_plasmascreen/textures/homedecor_plasmascreen_back.png similarity index 100% rename from plasmascreen/textures/plasmascreen_back.png rename to homedecor_plasmascreen/textures/homedecor_plasmascreen_back.png diff --git a/plasmascreen/textures/plasmascreen_case.png b/homedecor_plasmascreen/textures/homedecor_plasmascreen_case.png similarity index 100% rename from plasmascreen/textures/plasmascreen_case.png rename to homedecor_plasmascreen/textures/homedecor_plasmascreen_case.png diff --git a/plasmascreen/textures/plasmascreen_case_off.png b/homedecor_plasmascreen/textures/homedecor_plasmascreen_case_off.png similarity index 100% rename from plasmascreen/textures/plasmascreen_case_off.png rename to homedecor_plasmascreen/textures/homedecor_plasmascreen_case_off.png diff --git a/plasmascreen/textures/plasmascreen_screen_off.png b/homedecor_plasmascreen/textures/homedecor_plasmascreen_screen_off.png similarity index 100% rename from plasmascreen/textures/plasmascreen_screen_off.png rename to homedecor_plasmascreen/textures/homedecor_plasmascreen_screen_off.png diff --git a/plasmascreen/textures/plasmascreen_tv_inv.png b/homedecor_plasmascreen/textures/homedecor_plasmascreen_tv_inv.png similarity index 100% rename from plasmascreen/textures/plasmascreen_tv_inv.png rename to homedecor_plasmascreen/textures/homedecor_plasmascreen_tv_inv.png diff --git a/plasmascreen/textures/plasmascreen_video.png b/homedecor_plasmascreen/textures/homedecor_plasmascreen_video.png similarity index 100% rename from plasmascreen/textures/plasmascreen_video.png rename to homedecor_plasmascreen/textures/homedecor_plasmascreen_video.png