mirror of
https://github.com/mt-mods/moretrees.git
synced 2025-06-30 23:20:45 +02:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
175
node_defs.lua
175
node_defs.lua
@ -2,6 +2,9 @@ local S = minetest.get_translator("moretrees")
|
||||
|
||||
moretrees.avoidnodes = {}
|
||||
|
||||
local jungle_sapling_texture = minetest.get_modpath("default") and "default_junglesapling.png"
|
||||
or "moretrees_cedar_sapling.png"
|
||||
|
||||
moretrees.treelist = {
|
||||
{"beech", S("Beech Tree")},
|
||||
{"apple_tree", S("Apple Tree")},
|
||||
@ -17,7 +20,7 @@ moretrees.treelist = {
|
||||
{"willow", S("Willow Tree")},
|
||||
{"rubber_tree", S("Rubber Tree")},
|
||||
{"fir", S("Douglas Fir"), "fir_cone", S("Fir Cone"), {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
|
||||
{"jungletree", S("Jungle Tree"), nil, nil, nil, nil, "default_junglesapling.png" },
|
||||
{"jungletree", S("Jungle Tree"), nil, nil, nil, nil, jungle_sapling_texture },
|
||||
}
|
||||
|
||||
moretrees.treedesc = {
|
||||
@ -224,8 +227,8 @@ end
|
||||
|
||||
-- redefine default leaves to handle plantlike and/or leaf decay options
|
||||
|
||||
if moretrees.plantlike_leaves then
|
||||
minetest.override_item("default:leaves", {
|
||||
if minetest.get_modpath("default") and moretrees.plantlike_leaves then
|
||||
minetest.override_item(xcompat.materials.apple_leaves, {
|
||||
inventory_image = minetest.inventorycube("default_leaves.png"),
|
||||
drawtype = "plantlike",
|
||||
visual_scale = math.sqrt(2)
|
||||
@ -234,8 +237,8 @@ end
|
||||
|
||||
-- redefine default jungle leaves for same
|
||||
|
||||
if moretrees.plantlike_leaves then
|
||||
minetest.override_item("default:jungleleaves", {
|
||||
if minetest.get_modpath("default") and moretrees.plantlike_leaves then
|
||||
minetest.override_item(xcompat.materials.jungle_leaves, {
|
||||
inventory_image = minetest.inventorycube("default_jungleleaves.png"),
|
||||
drawtype = "plantlike",
|
||||
visual_scale = math.sqrt(2)
|
||||
@ -281,17 +284,19 @@ for i in ipairs(moretrees.treelist) do
|
||||
paramtype2 = "facedir",
|
||||
is_ground_content = false,
|
||||
groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
|
||||
sounds = default.node_sound_wood_defaults(),
|
||||
sounds = xcompat.sounds.node_sound_wood_defaults(),
|
||||
on_place = minetest.rotate_node,
|
||||
})
|
||||
|
||||
minetest.register_node("moretrees:"..treename.."_planks", {
|
||||
description = moretrees.treedesc[treename].planks,
|
||||
tiles = {"moretrees_"..treename.."_wood.png"},
|
||||
is_ground_content = false,
|
||||
groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
|
||||
sounds = default.node_sound_wood_defaults(),
|
||||
})
|
||||
if moretrees.enable_planks then
|
||||
minetest.register_node("moretrees:"..treename.."_planks", {
|
||||
description = moretrees.treedesc[treename].planks,
|
||||
tiles = {"moretrees_"..treename.."_wood.png"},
|
||||
is_ground_content = false,
|
||||
groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
|
||||
sounds = xcompat.sounds.node_sound_wood_defaults(),
|
||||
})
|
||||
end
|
||||
|
||||
local moretrees_leaves_inventory_image = nil
|
||||
|
||||
@ -309,7 +314,7 @@ for i in ipairs(moretrees.treelist) do
|
||||
paramtype = "light",
|
||||
is_ground_content = false,
|
||||
groups = {snappy = 3, flammable = 2, leaves = 1, moretrees_leaves = 1, leafdecay = 1},
|
||||
sounds = default.node_sound_leaves_defaults(),
|
||||
sounds = xcompat.sounds.node_sound_leaves_defaults(),
|
||||
|
||||
drop = {
|
||||
max_items = 1,
|
||||
@ -320,27 +325,25 @@ for i in ipairs(moretrees.treelist) do
|
||||
},
|
||||
})
|
||||
|
||||
if moretrees.enable_stairs then
|
||||
if minetest.get_modpath("moreblocks") then
|
||||
if minetest.get_modpath("moreblocks") then
|
||||
|
||||
-- stairsplus:register_all(modname, subname, recipeitem, {fields})
|
||||
|
||||
stairsplus:register_all(
|
||||
"moretrees",
|
||||
treename.."_trunk",
|
||||
"moretrees:"..treename.."_trunk",
|
||||
{
|
||||
groups = { snappy=1, choppy=2, oddly_breakable_by_hand=1, flammable=2, not_in_creative_inventory=1 },
|
||||
tiles = {
|
||||
"moretrees_"..treename.."_trunk_top.png",
|
||||
"moretrees_"..treename.."_trunk_top.png",
|
||||
"moretrees_"..treename.."_trunk.png"
|
||||
},
|
||||
description = moretrees.treedesc[treename].trunk,
|
||||
drop = treename.."_trunk",
|
||||
}
|
||||
)
|
||||
stairsplus:register_all(
|
||||
"moretrees",
|
||||
treename.."_trunk",
|
||||
"moretrees:"..treename.."_trunk",
|
||||
{
|
||||
groups = { snappy=1, choppy=2, oddly_breakable_by_hand=1, flammable=2, not_in_creative_inventory=1 },
|
||||
tiles = {
|
||||
"moretrees_"..treename.."_trunk_top.png",
|
||||
"moretrees_"..treename.."_trunk_top.png",
|
||||
"moretrees_"..treename.."_trunk.png"
|
||||
},
|
||||
description = moretrees.treedesc[treename].trunk,
|
||||
drop = treename.."_trunk",
|
||||
}
|
||||
)
|
||||
|
||||
if moretrees.enable_planks then
|
||||
stairsplus:register_all(
|
||||
"moretrees",
|
||||
treename.."_planks",
|
||||
@ -352,20 +355,22 @@ for i in ipairs(moretrees.treelist) do
|
||||
drop = treename.."_planks",
|
||||
}
|
||||
)
|
||||
elseif minetest.get_modpath("stairs") then
|
||||
stairs.register_stair_and_slab(
|
||||
"moretrees_"..treename.."_trunk",
|
||||
"moretrees:"..treename.."_trunk",
|
||||
{ snappy=1, choppy=2, oddly_breakable_by_hand=1, flammable=2 },
|
||||
{ "moretrees_"..treename.."_trunk_top.png",
|
||||
"moretrees_"..treename.."_trunk_top.png",
|
||||
"moretrees_"..treename.."_trunk.png"
|
||||
},
|
||||
moretrees.treedesc[treename].trunk_stair,
|
||||
moretrees.treedesc[treename].trunk_slab,
|
||||
default.node_sound_wood_defaults()
|
||||
)
|
||||
end
|
||||
elseif minetest.get_modpath("stairs") then
|
||||
stairs.register_stair_and_slab(
|
||||
"moretrees_"..treename.."_trunk",
|
||||
"moretrees:"..treename.."_trunk",
|
||||
{ snappy=1, choppy=2, oddly_breakable_by_hand=1, flammable=2 },
|
||||
{ "moretrees_"..treename.."_trunk_top.png",
|
||||
"moretrees_"..treename.."_trunk_top.png",
|
||||
"moretrees_"..treename.."_trunk.png"
|
||||
},
|
||||
moretrees.treedesc[treename].trunk_stair,
|
||||
moretrees.treedesc[treename].trunk_slab,
|
||||
xcompat.sounds.node_sound_wood_defaults()
|
||||
)
|
||||
|
||||
if moretrees.enable_planks then
|
||||
stairs.register_stair_and_slab(
|
||||
"moretrees_"..treename.."_planks",
|
||||
"moretrees:"..treename.."_planks",
|
||||
@ -373,13 +378,13 @@ for i in ipairs(moretrees.treelist) do
|
||||
{ "moretrees_"..treename.."_wood.png" },
|
||||
moretrees.treedesc[treename].planks_stair,
|
||||
moretrees.treedesc[treename].planks_slab,
|
||||
default.node_sound_wood_defaults()
|
||||
xcompat.sounds.node_sound_wood_defaults()
|
||||
)
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
if moretrees.enable_fences then
|
||||
if minetest.get_modpath("default") and moretrees.enable_planks then
|
||||
local planks_name = "moretrees:" .. treename .. "_planks"
|
||||
local planks_tile = "moretrees_" .. treename .. "_wood.png"
|
||||
default.register_fence("moretrees:" .. treename .. "_fence", {
|
||||
@ -391,7 +396,7 @@ for i in ipairs(moretrees.treelist) do
|
||||
"^default_fence_overlay.png^[makealpha:255,126,126",
|
||||
material = planks_name,
|
||||
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
|
||||
sounds = default.node_sound_wood_defaults()
|
||||
sounds = xcompat.sounds.node_sound_wood_defaults()
|
||||
})
|
||||
default.register_fence_rail("moretrees:" .. treename .. "_fence_rail", {
|
||||
description = moretrees.treedesc[treename].fence_rail,
|
||||
@ -402,7 +407,7 @@ for i in ipairs(moretrees.treelist) do
|
||||
"^default_fence_rail_overlay.png^[makealpha:255,126,126",
|
||||
material = planks_name,
|
||||
groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
|
||||
sounds = default.node_sound_wood_defaults()
|
||||
sounds = xcompat.sounds.node_sound_wood_defaults()
|
||||
})
|
||||
if minetest.global_exists("doors") then
|
||||
doors.register_fencegate("moretrees:" .. treename .. "_gate", {
|
||||
@ -436,9 +441,9 @@ for i in ipairs(moretrees.treelist) do
|
||||
fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
|
||||
},
|
||||
groups = regular_groups,
|
||||
sounds = default.node_sound_defaults(),
|
||||
sounds = xcompat.sounds.node_sound_default(),
|
||||
on_place = function(itemstack, placer, pointed_thing)
|
||||
itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
|
||||
itemstack = xcompat.functions.sapling_on_place(itemstack, placer, pointed_thing,
|
||||
"moretrees:" ..treename.. "_sapling",
|
||||
-- minp, maxp to be checked, relative to sapling pos
|
||||
-- minp_relative.y = 1 because sapling pos has been checked
|
||||
@ -469,7 +474,15 @@ for i in ipairs(moretrees.treelist) do
|
||||
})
|
||||
end
|
||||
|
||||
local ongen_groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1,sapling=1,not_in_creative_inventory=1}
|
||||
local ongen_groups = {
|
||||
snappy = 2,
|
||||
dig_immediate = 3,
|
||||
flammable = 2,
|
||||
attached_node = 1,
|
||||
sapling = 1,
|
||||
moretrees_ongen = 1,
|
||||
not_in_creative_inventory = 1
|
||||
}
|
||||
if minetest.settings:get_bool("creative_mode", false) then
|
||||
ongen_groups["not_in_creative_inventory"]=nil
|
||||
end
|
||||
@ -487,10 +500,10 @@ for i in ipairs(moretrees.treelist) do
|
||||
fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
|
||||
},
|
||||
groups = ongen_groups,
|
||||
sounds = default.node_sound_defaults(),
|
||||
sounds = xcompat.sounds.node_sound_default(),
|
||||
drop = "moretrees:"..treename.."_sapling",
|
||||
on_place = function(itemstack, placer, pointed_thing)
|
||||
itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
|
||||
itemstack = xcompat.functions.sapling_on_place(itemstack, placer, pointed_thing,
|
||||
"moretrees:" ..treename.. "_sapling_ongen",
|
||||
-- minp, maxp to be checked, relative to sapling pos
|
||||
-- minp_relative.y = 1 because sapling pos has been checked
|
||||
@ -539,7 +552,7 @@ for i in ipairs(moretrees.treelist) do
|
||||
fixed = selbox
|
||||
},
|
||||
groups = {fleshy=3,dig_immediate=3,flammable=2, attached_node=1, leafdecay = 1, leafdecay_drop = 1},
|
||||
sounds = default.node_sound_defaults(),
|
||||
sounds = xcompat.sounds.node_sound_default(),
|
||||
after_place_node = function(pos, placer)
|
||||
if placer:is_player() then
|
||||
minetest.set_node(pos, {name = "moretrees:"..fruit, param2 = 1})
|
||||
@ -550,7 +563,8 @@ for i in ipairs(moretrees.treelist) do
|
||||
|
||||
if treename ~= "jungletree"
|
||||
and treename ~= "poplar_small"
|
||||
and treename ~= "pine" then
|
||||
and treename ~= "pine"
|
||||
and minetest.get_modpath("default") then
|
||||
default.register_leafdecay({
|
||||
trunks = { "moretrees:"..treename.."_trunk" },
|
||||
leaves = { "moretrees:"..treename.."_leaves", fruitname },
|
||||
@ -613,30 +627,31 @@ for color = 1, #jungleleaves do
|
||||
paramtype = "light",
|
||||
is_ground_content = false,
|
||||
groups = {snappy = 3, flammable = 2, leaves = 1, moretrees_leaves = 1, leafdecay = 3 },
|
||||
drop = {
|
||||
drop = minetest.get_modpath("default") and {
|
||||
max_items = 1,
|
||||
items = {
|
||||
{items = {"default:junglesapling"}, rarity = 100 },
|
||||
{items = {"moretrees:jungletree_leaves_"..jungleleaves[color]} }
|
||||
}
|
||||
},
|
||||
sounds = default.node_sound_leaves_defaults(),
|
||||
} or nil,
|
||||
sounds = xcompat.sounds.node_sound_leaves_defaults(),
|
||||
})
|
||||
end
|
||||
|
||||
-- To get Moretrees to generate its own jungle trees among the default mapgen
|
||||
-- we need our own copy of that node, which moretrees will match against.
|
||||
|
||||
local jungle_tree = table.copy(minetest.registered_nodes["default:jungletree"])
|
||||
jungle_tree.drop = jungle_tree.drop or { items = {} }
|
||||
table.insert(jungle_tree.drop.items, { items = {"default:jungletree"}})
|
||||
minetest.register_node("moretrees:jungletree_trunk", jungle_tree)
|
||||
if minetest.get_modpath("default") then
|
||||
local jungle_tree = table.copy(minetest.registered_nodes["default:jungletree"])
|
||||
jungle_tree.drop = "default:jungletree"
|
||||
minetest.register_node("moretrees:jungletree_trunk", jungle_tree)
|
||||
|
||||
default.register_leafdecay({
|
||||
trunks = { "default:jungletree", "moretrees:jungletree_trunk" },
|
||||
leaves = { "default:jungleleaves", "moretrees:jungletree_leaves_yellow", "moretrees:jungletree_leaves_red" },
|
||||
radius = moretrees.leafdecay_radius,
|
||||
})
|
||||
default.register_leafdecay({
|
||||
trunks = { "default:jungletree", "moretrees:jungletree_trunk" },
|
||||
leaves = { xcompat.materials.jungle_leaves, "moretrees:jungletree_leaves_yellow", "moretrees:jungletree_leaves_red" },
|
||||
radius = moretrees.leafdecay_radius,
|
||||
})
|
||||
end
|
||||
|
||||
-- Extra needles for firs
|
||||
|
||||
@ -663,17 +678,19 @@ minetest.register_node("moretrees:fir_leaves_bright", {
|
||||
{items = {'moretrees:fir_leaves_bright'} }
|
||||
}
|
||||
},
|
||||
sounds = default.node_sound_leaves_defaults()
|
||||
sounds = xcompat.sounds.node_sound_leaves_defaults()
|
||||
})
|
||||
|
||||
default.register_leafdecay({
|
||||
trunks = { "moretrees:fir_trunk" },
|
||||
leaves = { "moretrees:fir_leaves", "moretrees:fir_leaves_bright" },
|
||||
radius = moretrees.leafdecay_radius,
|
||||
})
|
||||
if minetest.get_modpath("default") then
|
||||
default.register_leafdecay({
|
||||
trunks = { "moretrees:fir_trunk" },
|
||||
leaves = { "moretrees:fir_leaves", "moretrees:fir_leaves_bright" },
|
||||
radius = moretrees.leafdecay_radius,
|
||||
})
|
||||
end
|
||||
|
||||
|
||||
if moretrees.enable_redefine_apple then
|
||||
if minetest.get_modpath("default") and moretrees.enable_redefine_apple then
|
||||
local appledef = table.copy(minetest.registered_nodes["default:apple"])
|
||||
appledef.groups.attached_node = 1
|
||||
minetest.register_node(":default:apple", appledef)
|
||||
@ -701,7 +718,7 @@ minetest.register_node("moretrees:rubber_tree_trunk_empty", {
|
||||
"moretrees_rubber_tree_trunk_empty.png"
|
||||
},
|
||||
groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
|
||||
sounds = default.node_sound_wood_defaults(),
|
||||
sounds = xcompat.sounds.node_sound_wood_defaults(),
|
||||
paramtype2 = "facedir",
|
||||
is_ground_content = false,
|
||||
on_place = minetest.rotate_node,
|
||||
@ -747,7 +764,7 @@ minetest.register_alias("conifers:sapling", "moretrees:fir_sapling")
|
||||
minetest.register_alias("moretrees:jungletree_sapling", "default:junglesapling")
|
||||
minetest.register_alias("moretrees:jungletree_trunk_sideways", "moreblocks:horizontal_jungle_tree")
|
||||
minetest.register_alias("moretrees:jungletree_planks", "default:junglewood")
|
||||
minetest.register_alias("moretrees:jungletree_leaves_green", "default:jungleleaves")
|
||||
minetest.register_alias("moretrees:jungletree_leaves_green", xcompat.materials.jungle_leaves)
|
||||
|
||||
minetest.register_alias("moretrees:acacia_trunk", "default:acacia_tree")
|
||||
minetest.register_alias("moretrees:acacia_planks", "default:acacia_wood")
|
||||
|
||||
Reference in New Issue
Block a user