Skip to content

Commit

Permalink
Wooden blocks: Refactoring lottplants: move hardwood into this mo…
Browse files Browse the repository at this point in the history
…d (and rename). Relates to #1236 #1233
  • Loading branch information
alek13 committed Feb 25, 2024
1 parent 804d7c0 commit f7df4cd
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion mods/_various/castle/tapestry.lua
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ local tapestry_tops = {
{ "castle:tapestry_top_junglewood", "lottblocks:stick_junglewood", SL("Jungle Wood"),"default_junglewood.png" },
{ "castle:tapestry_top_alder", "lottblocks:stick_alder", SL("Alder"), "lottplants_alderwood.png" },
{ "castle:tapestry_top_birch", "lottblocks:stick_birch", SL("Birch"), "lottplants_birchwood.png" },
{ "castle:tapestry_top_hardwood", "lottblocks:stick_hardwood", SL("Hardwood"), "lottblocks_hardwood.png" },
{ "castle:tapestry_top_hardwood", "lottblocks:stick_hardwood", SL("Hardwood"), "lottplants_hardwood.png" },
{ "castle:tapestry_top_lebethron", "lottblocks:stick_lebethron", SL("Lebethron"), "lottplants_lebethronwood.png"},
{ "castle:tapestry_top_mallorn", "lottblocks:stick_mallorn", SL("Mallorn"), "lottplants_mallornwood.png" },
{ "castle:tapestry_top_pine", "lottblocks:stick_pine", SL("Pine"), "lottplants_pinewood.png" },
Expand Down
2 changes: 1 addition & 1 deletion mods/lord/Blocks/lord_homedecor/building_blocks.lua
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ minetest.register_craftitem("lord_homedecor:sticks", {
minetest.register_alias("fakegrass", "lord_homedecor:fakegrass")
minetest.register_alias("adobe", "lord_homedecor:Adobe")
minetest.register_alias("building_blocks_roofing", "lord_homedecor:Roofing")
minetest.register_alias("hardwood", "lord_homedecor:hardwood")
minetest.register_alias("hardwood", "lottplants:hardwood")
minetest.register_alias("sticks", "lord_homedecor:sticks")
minetest.register_alias("lord_homedecor:faggot", "lord_homedecor:sticks")

Expand Down
6 changes: 3 additions & 3 deletions mods/lord/Blocks/lord_homedecor/misc-nodes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ lord_homedecor.banister_materials = {
{
"hardwood",
"hardwood",
"lottblocks_hardwood.png",
"lottblocks_hardwood.png",
"lord_homedecor:hardwood",
"lottplants_hardwood.png",
"lottplants_hardwood.png",
"lottplants:hardwood",
"lottblocks:stick_hardwood",
"",
"",
Expand Down
12 changes: 6 additions & 6 deletions mods/lord/Blocks/lottblocks/wooden_stuff.lua
Original file line number Diff line number Diff line change
Expand Up @@ -95,20 +95,20 @@ local function register_fence(name, description_prefix, wood_name, node_groups)
default.register_fence("lottblocks:fence_" .. name, {
description = S(description_prefix .. " Fence"),
texture = "lottblocks_fence_"..name..".png",
inventory_image = "default_fence_overlay.png^lottblocks_"..name..".png^" ..
inventory_image = "default_fence_overlay.png^lottplants_"..name..".png^" ..
"default_fence_overlay.png^[makealpha:255,126,126",
wield_image = "default_fence_overlay.png^lottblocks_"..name..".png^" ..
wield_image = "default_fence_overlay.png^lottplants_"..name..".png^" ..
"default_fence_overlay.png^[makealpha:255,126,126",
material = wood_name,
groups = node_groups,
sounds = default.node_sound_wood_defaults()
})
default.register_fence_rail("lottblocks:fence_rail_" .. name, {
description = S(description_prefix .. " Fence Rail"),
texture = "lottblocks_"..name..".png",
inventory_image = "default_fence_rail_overlay.png^lottblocks_"..name..".png^" ..
texture = "lottplants_"..name..".png",
inventory_image = "default_fence_rail_overlay.png^lottplants_"..name..".png^" ..
"default_fence_rail_overlay.png^[makealpha:255,126,126",
wield_image = "default_fence_rail_overlay.png^lottblocks_"..name..".png^" ..
wield_image = "default_fence_rail_overlay.png^lottplants_"..name..".png^" ..
"default_fence_rail_overlay.png^[makealpha:255,126,126",
material = wood_name,
groups = node_groups,
Expand Down Expand Up @@ -401,7 +401,7 @@ lottblocks.register_wooden_stuff("birch", "Birch", "lottplants_birchwood.png", "
lottblocks.register_wooden_stuff("pine", "Pine", "lottplants_pinewood.png", "lottplants:pinewood")
lottblocks.register_wooden_stuff("lebethron", "Lebethron", "lottplants_lebethronwood.png", "lottplants:lebethronwood")
lottblocks.register_wooden_stuff("mallorn", "Mallorn", "lottplants_mallornwood.png", "lottplants:mallornwood")
lottblocks.register_wooden_stuff("hardwood", "Hardwood", "lottblocks_hardwood.png", "lord_homedecor:hardwood")
lottblocks.register_wooden_stuff("hardwood", "Hardwood", "lottplants_hardwood.png", "lottplants:hardwood")

minetest.register_alias("lottblocks:wooden_stanchion", "lottblocks:wood_stanchion")
minetest.register_alias("lottblocks:fence_junglewood", "default:fence_junglewood")
17 changes: 9 additions & 8 deletions mods/lord/Blocks/lottplants/planks.lua
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,14 @@ minetest.register_node("lottplants:mallornwood", {
place_param2 = 0,
})

minetest.register_node(":lord_homedecor:hardwood", {
tiles = {"lottblocks_hardwood.png"},
minetest.register_node("lottplants:hardwood", {
tiles = {"lottplants_hardwood.png"},
is_ground_content = true,
description = S("Hardwood"),
groups = {choppy=1,flammable=1,wood=1},
groups = { choppy = 1, flammable = 1, wood = 1 },
sounds = default.node_sound_wood_defaults(),
})
minetest.register_alias("lord_homedecor:hardwood", "lottplants:hardwood")

minetest.register_node("lottplants:firwood", {
description = S("Fir Planks"),
Expand Down Expand Up @@ -150,9 +151,9 @@ stairs.register_stair_and_slab(

stairs.register_stair_and_slab(
"hardwood",
"lord_homedecor:hardwood",
"lottplants:hardwood",
{choppy=1,flammable=1},
{"lottblocks_hardwood.png"},
{"lottplants_hardwood.png"},
S("Hardwood stair"),
S("Hardwood slab"),
default.node_sound_wood_defaults(),
Expand Down Expand Up @@ -216,14 +217,14 @@ minetest.register_craft({

-- different craft for hardwood
minetest.register_craft({
output = 'lord_homedecor:hardwood 2',
output = 'lottplants:hardwood 2',
recipe = {
{"default:wood", "default:junglewood"},
{"default:junglewood", "default:wood"},
}
})
minetest.register_craft({
output = 'lord_homedecor:hardwood 2',
output = 'lottplants:hardwood 2',
recipe = {
{"default:junglewood", "default:wood"},
{"default:wood", "default:junglewood"},
Expand All @@ -233,6 +234,6 @@ minetest.register_craft({
-- hardwood burned slower
minetest.register_craft({
type = "fuel",
recipe = "lord_homedecor:hardwood",
recipe = "lottplants:hardwood",
burntime = 28,
})

0 comments on commit f7df4cd

Please sign in to comment.