gergely/luanti-stripped-tree
1
0
Fork 0
Code Issues Pull Requests Actions 9 Packages Projects Releases Wiki Activity

Reformat files so they are easier to read and work with #2

Merged
gergely merged 2 commits from reformat into main 2025-12-16 20:15:32 +01:00
Conversation 0 Commits 2 Files Changed 9 +345 -293
9 changed files with 345 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
.lua-format Normal file
View File

@@ -0,0 +1,33 @@
column_limit: 120
indent_width: 4
use_tab: false
tab_width: 4
continuation_indent_width: 4
spaces_before_call: 1
keep_simple_control_block_one_line: true
keep_simple_function_one_line: true
align_args: true
break_after_functioncall_lp: true
break_before_functioncall_rp: true
spaces_inside_functioncall_parens: false
spaces_inside_functiondef_parens: false
align_parameter: true
chop_down_parameter: false
break_after_functiondef_lp: true
break_before_functiondef_rp: true
align_table_field: true
break_after_table_lb: true
break_before_table_rb: true
chop_down_table: true
chop_down_kv_table: true
table_sep: ","
extra_sep_at_table_end: true
column_table_limit: 0
column_table_limit_kv: 0
spaces_inside_table_braces: false
break_after_operator: true
double_quote_to_single_quote: false
single_quote_to_double_quote: true
spaces_around_equals_in_field: true
line_breaks_after_function_body: 1
line_separator: input

3
.luacheckrc
View File

@@ -1,4 +1,3 @@
unused_args = false unused_args = false
allow_defined_top = true allow_defined_top = true
exclude_files = {".luacheckrc"} exclude_files = {".luacheckrc"}
@@ -18,6 +17,6 @@ read_globals = {
-- MTG -- MTG
"default", "sfinv", "creative", "default", "sfinv", "creative",
--depends -- Dependencies
"moretrees", "ethereal", "moreores" "moretrees", "ethereal", "moreores"
} }

45
chiseling_machine.lua
View File

@@ -1,13 +1,35 @@
local max_stack = tonumber(minetest.settings:get("default_stack_max")) or 99 local max_stack = tonumber(minetest.settings:get("default_stack_max")) or 99
minetest.register_node("stripped_tree:chiseling_machine", { -- LuaFormatter off
local machine_formspec = "" ..
"size[8,9]" ..
"label[0,0;Chiseling Machine]" ..
"image[2,2;1,1;chisel.png]" ..
"list[current_name;src;2,1;1,1;]" ..
"list[current_name;dst;5,1;2,2;]" ..
"list[current_player;main;0,5;8,4;]" ..
"listring[current_name;dst]" ..
"listring[current_player;main]" ..
"listring[current_name;src]" ..
"listring[current_player;main]"
-- LuaFormatter on
minetest.register_node(
"stripped_tree:chiseling_machine", {
description = "Chiseladora para troncos", description = "Chiseladora para troncos",
tiles = {"chiseling_machine.png", "chiseling_machine.png", "chiseling_machine_side.png", "chiseling_machine_side.png","chiseling_machine_side.png", "chiseling_machine_side.png"}, tiles = {
"chiseling_machine.png",
"chiseling_machine.png",
"chiseling_machine_side.png",
"chiseling_machine_side.png",
"chiseling_machine_side.png",
"chiseling_machine_side.png",
},
groups = {cracky = 1}, groups = {cracky = 1},
after_place_node = function(pos, placer) after_place_node = function(pos, placer)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("formspec", "size[8,9]label[0,0;Chiseling Machine]image[2,2;1,1;chisel.png]list[current_name;src;2,1;1,1;]list[current_name;dst;5,1;2,2;]list[current_player;main;0,5;8,4;]listring[current_name;dst]listring[current_player;main]listring[current_name;src]listring[current_player;main]") meta:set_string("formspec", machine_formspec)
end, end,
on_construct = function(pos) on_construct = function(pos)
@@ -43,14 +65,17 @@ minetest.register_node("stripped_tree:chiseling_machine", {
allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
return count return count
end end,
}) }
)
minetest.register_craft({ minetest.register_craft(
{
output = "stripped_tree:chiseling_machine", output = "stripped_tree:chiseling_machine",
recipe = { recipe = {
{"group:wood","default:diamond","group:wood"}, {"group:wood", "default:diamond", "group:wood"},
{"group:wood","stripped_tree:chisel","group:wood"}, {"group:wood", "stripped_tree:chisel", "group:wood"},
{"group:wood", "group:wood","group:wood"}, {"group:wood", "group:wood", "group:wood"},
}, },
}) }
)

100
default.lua
View File

@@ -1,68 +1,58 @@
--Register tree bark -- Register tree bark
minetest.register_craftitem(":default:tree_bark", { minetest.register_craftitem(
description = "Tree bark", ":default:tree_bark",
inventory_image = "tree_bark.png", {description = "Tree bark", inventory_image = "tree_bark.png", groups = {not_in_creative_inventory = 1}}
groups = {not_in_creative_inventory = 1} )
})
--register bark as fuel
minetest.register_craft({
type = "fuel",
recipe = "default:tree_bark",
burntime = 15,
})
--Register craft for string -- Register bark as fuel
minetest.register_craft({type = "fuel", recipe = "default:tree_bark", burntime = 15})
-- Register craft for string
if minetest.get_modpath("farming") then if minetest.get_modpath("farming") then
minetest.register_craft(
minetest.register_craft({ {
output = "farming:string 4", output = "farming:string 4",
recipe = {{"default:tree_bark","default:tree_bark","default:tree_bark"}, recipe = {
{"default:tree_bark","default:tree_bark","default:tree_bark"}, {"default:tree_bark", "default:tree_bark", "default:tree_bark"},
{"default:tree_bark","default:tree_bark","default:tree_bark"}} {"default:tree_bark", "default:tree_bark", "default:tree_bark"},
}) {"default:tree_bark", "default:tree_bark", "default:tree_bark"},
},
}
)
end end
--Register craft for paper -- Register craft for paper
minetest.register_craft({ minetest.register_craft(
{
output = "default:paper 8", output = "default:paper 8",
recipe = {{"default:tree_bark","default:tree_bark","default:tree_bark"}, recipe = {
{"default:tree_bark","bucket:bucket_water","default:tree_bark"}, {"default:tree_bark", "default:tree_bark", "default:tree_bark"},
{"default:tree_bark","default:tree_bark","default:tree_bark"}} {"default:tree_bark", "bucket:bucket_water", "default:tree_bark"},
}) {"default:tree_bark", "default:tree_bark", "default:tree_bark"},
},
}
)
--Register craft for mulch -- Register craft for mulch
if minetest.get_modpath("bonemeal") then if minetest.get_modpath("bonemeal") then
minetest.register_craft(
minetest.register_craft({ {
output = "bonemeal:mulch 4", output = "bonemeal:mulch 4",
recipe = {{"default:tree_bark","default:tree_bark","default:tree_bark"}, recipe = {
{"default:tree_bark","default:tree_bark","default:tree_bark"}, {"default:tree_bark", "default:tree_bark", "default:tree_bark"},
{"","",""}} {"default:tree_bark", "default:tree_bark", "default:tree_bark"},
}) {"", "", ""},
},
}
)
end end
--Register stripped trees
-- Register stripped trees
local mod_name = "default" local mod_name = "default"
local trunk_names = { local trunk_names = {"tree", "jungletree", "aspen_tree", "acacia_tree", "pine_tree"}
"tree",
"jungletree",
"aspen_tree",
"acacia_tree",
"pine_tree",
}
stripped_tree.register_trunk(mod_name,trunk_names) stripped_tree.register_trunk(mod_name, trunk_names)
--Register axes
local axe_types = {
"axe_wood",
"axe_stone",
"axe_bronze",
"axe_steel",
"axe_mese",
"axe_diamond",
}
if not stripped_tree.ENABLE_CHISEL then
stripped_tree.register_axes(mod_name,axe_types)
end
-- Register axes
local axe_types = {"axe_wood", "axe_stone", "axe_bronze", "axe_steel", "axe_mese", "axe_diamond"}
if not stripped_tree.ENABLE_CHISEL then stripped_tree.register_axes(mod_name, axe_types) end

15
ethereal.lua
View File

@@ -1,4 +1,4 @@
--Register stripped trees -- Register stripped trees
local mod_name = "ethereal" local mod_name = "ethereal"
local trunk_names = { local trunk_names = {
"banana_trunk", "banana_trunk",
@@ -12,13 +12,8 @@ local trunk_names = {
"palm_trunk", "palm_trunk",
} }
stripped_tree.register_trunk(mod_name,trunk_names) stripped_tree.register_trunk(mod_name, trunk_names)
-- Register axes
--Register axes local axe_types = {"axe_crystal"}
local axe_types = { if not stripped_tree.ENABLE_CHISEL then stripped_tree.register_axes(mod_name, axe_types) end
"axe_crystal",
}
if not stripped_tree.ENABLE_CHISEL then
stripped_tree.register_axes(mod_name,axe_types)
end

88
functions.lua
View File

@@ -1,71 +1,87 @@
stripped_tree = {} stripped_tree = {}
--Select between chisel tool or axes.
stripped_tree.ENABLE_CHISEL = core.settings:get_bool"stripped_tree_enable_chisel" -- Select between chisel tool or axes.
stripped_tree.ENABLE_CHISEL = core.settings:get_bool("stripped_tree_enable_chisel")
-- Check if we are running on a creative server
local creative_mode = minetest.settings:get_bool("creative_mode") local creative_mode = minetest.settings:get_bool("creative_mode")
--Function to verify that stripped tree trunk exists -- Function to verify that stripped tree trunk exists
stripped_tree.has_stripped = function(pos) stripped_tree.has_stripped = function(pos)
local node = minetest.get_node(pos).name or pos local node = minetest.get_node(pos).name or pos
local mod_name, node_name = unpack(node:split(":")) local mod_name, node_name = unpack(node:split(":"))
local has_stripped = minetest.registered_nodes[mod_name..":".."stripped_"..node_name] local has_stripped = minetest.registered_nodes[mod_name .. ":" .. "stripped_" .. node_name]
return has_stripped return has_stripped
end end
--Function to swap nodes -- Function to swap nodes
stripped_tree.swap_node = function(pos,user,creative_mode) stripped_tree.swap_node = function(pos, user, creative_mode)
local old_node = minetest.get_node(pos) local old_node = minetest.get_node(pos)
local stripped =mod_name..":".."stripped_"..node_name local stripped = mod_name .. ":" .. "stripped_" .. node_name
minetest.swap_node(pos,{name=stripped,param2=old_node.param2})
--itemstack:add_wear(65535 / 299) this is not useful at moment. minetest.swap_node(pos, {name = stripped, param2 = old_node.param2})
-- itemstack:add_wear(65535 / 299) this is not useful at moment.
if not creative_mode then if not creative_mode then
local inv = user:get_inventory() local inv = user:get_inventory()
--check for room in inv, if not, drop item
-- If the player has room in their inventory for a bark, give them one; otherwise, drop the bark to the ground.
if inv:room_for_item("main", "default:tree_bark") then if inv:room_for_item("main", "default:tree_bark") then
inv:add_item("main", {name="default:tree_bark"}) inv:add_item("main", {name = "default:tree_bark"})
else else
minetest.add_item(pos, "default:tree_bark") minetest.add_item(pos, "default:tree_bark")
end end
end end
return itemstack return itemstack
end end
--function to register nodes -- Function to register nodes
function stripped_tree.register_trunk(mod_name,trunk_names) function stripped_tree.register_trunk(mod_name, trunk_names)
for _, name in ipairs(trunk_names) do for _, name in ipairs(trunk_names) do
minetest.register_node(":"..mod_name..":stripped_" .. name, { minetest.register_node(
description = "Stripped "..name, ":" .. mod_name .. ":stripped_" .. name, {
description = "Stripped " .. name,
tiles = { tiles = {
"stripped_"..mod_name.."_"..name.."_top.png", "stripped_" .. mod_name .. "_" .. name .. "_top.png",
"stripped_"..mod_name.."_"..name.."_top.png", "stripped_" .. mod_name .. "_" .. name .. "_top.png",
"stripped_"..mod_name.."_"..name..".png" "stripped_" .. mod_name .. "_" .. name .. ".png",
},
groups = {
tree = 1,
choppy = 2,
oddly_breakable_by_hand = 1,
flammable = 2,
not_in_creative_inventory = 1,
}, },
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, not_in_creative_inventory = 1},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
paramtype2 = "facedir", paramtype2 = "facedir",
on_place = minetest.rotate_node, on_place = minetest.rotate_node,
}) }
)
minetest.register_craft({ minetest.register_craft(
output = mod_name..":"..name, {
recipe = {{"","default:tree_bark",""}, output = mod_name .. ":" .. name,
{"default:tree_bark",mod_name..":stripped_" .. name,"default:tree_bark"}, recipe = {
{"","default:tree_bark",""}} {"", "default:tree_bark", ""},
}) {"default:tree_bark", mod_name .. ":stripped_" .. name, "default:tree_bark"},
{"", "default:tree_bark", ""},
},
}
)
end end
end end
--function to override axes -- Function to override axes
if stripped_tree.ENABLE_CHISEL ~= true then if stripped_tree.ENABLE_CHISEL ~= true then
function stripped_tree.register_axes(mod_n,axe_types) function stripped_tree.register_axes(mod_n, axe_types)
for _, axe_name in ipairs(axe_types) do for _, axe_name in ipairs(axe_types) do
minetest.override_item(mod_n..":" .. axe_name, { minetest.override_item(
mod_n .. ":" .. axe_name, {
on_place = function(itemstack, user, pointed_thing) on_place = function(itemstack, user, pointed_thing)
if pointed_thing.type ~= "node" then if pointed_thing.type ~= "node" then return end
return
end
local pos = pointed_thing.under local pos = pointed_thing.under
local pname = user:get_player_name() local pname = user:get_player_name()
@@ -76,11 +92,11 @@ if stripped_tree.ENABLE_CHISEL ~= true then
end end
if stripped_tree.has_stripped(pos) then if stripped_tree.has_stripped(pos) then
stripped_tree.swap_node(pos,user,creative_mode) stripped_tree.swap_node(pos, user, creative_mode)
end end
end, end,
}) }
)
end end
end end
end end

62
init.lua
View File

@@ -1,42 +1,30 @@
-- Get our own path
-- get modpath
local mpath = minetest.get_modpath("stripped_tree") local mpath = minetest.get_modpath("stripped_tree")
-- load functions -- Load functions
dofile(mpath .. "/functions.lua") dofile(mpath .. "/functions.lua")
--load default -- Load default (AKA the Minetest game)
dofile(mpath .. "/default.lua") dofile(mpath .. "/default.lua")
dofile(mpath .. "/chiseling_machine.lua") dofile(mpath .. "/chiseling_machine.lua")
--load optional dependencies -- Load optional dependencies
if minetest.get_modpath("moretrees") then if minetest.get_modpath("moretrees") then dofile(mpath .. "/moretrees.lua") end
dofile(mpath .. "/moretrees.lua")
end
if minetest.get_modpath("ethereal") then if minetest.get_modpath("ethereal") then dofile(mpath .. "/ethereal.lua") end
dofile(mpath .. "/ethereal.lua")
end
if minetest.get_modpath("moreores") then if minetest.get_modpath("moreores") then dofile(mpath .. "/moreores.lua") end
dofile(mpath .. "/moreores.lua")
end
if stripped_tree.ENABLE_CHISEL then if stripped_tree.ENABLE_CHISEL then
minetest.register_tool(
minetest.register_tool("stripped_tree:chisel", { "stripped_tree:chisel", {
description = "Chisel for tree trunks", description = "Chisel for tree trunks",
inventory_image = "chisel.png", inventory_image = "chisel.png",
wield_image = "chisel.png", wield_image = "chisel.png",
sound = {breaks = "default_tool_breaks"}, sound = {breaks = "default_tool_breaks"},
stack_max = 1, stack_max = 1,
on_use = function(itemstack, user, pointed_thing) on_use = function(itemstack, user, pointed_thing)
if pointed_thing.type ~= "node" then return end
if pointed_thing.type ~= "node" then
return
end
local pos = pointed_thing.under local pos = pointed_thing.under
local pname = user:get_player_name() local pname = user:get_player_name()
@@ -48,36 +36,40 @@ if stripped_tree.ENABLE_CHISEL then
local node = minetest.get_node(pos).name local node = minetest.get_node(pos).name
local mod_name, node_name = unpack(node:split(":")) local mod_name, node_name = unpack(node:split(":"))
-- before concatenating check for nil
-- Before concatenating check for nil
if not mod_name then return end if not mod_name then return end
if not node_name then return end if not node_name then return end
local has_stripped = minetest.registered_nodes[mod_name..":".."stripped_"..node_name]
local has_stripped = minetest.registered_nodes[mod_name .. ":" .. "stripped_" .. node_name]
if has_stripped then if has_stripped then
local stripped = mod_name..":".."stripped_"..node_name local stripped = mod_name .. ":" .. "stripped_" .. node_name
minetest.swap_node(pos,{name=stripped}) minetest.swap_node(pos, {name = stripped})
if not minetest.settings:get_bool("creative_mode") then if not minetest.settings:get_bool("creative_mode") then
local inv = user:get_inventory() local inv = user:get_inventory()
--check for room in inv, if not, drop item
-- Check for room in inv, if not, drop item
if inv:room_for_item("main", "default:tree_bark") then if inv:room_for_item("main", "default:tree_bark") then
inv:add_item("main", {name="default:tree_bark"}) inv:add_item("main", {name = "default:tree_bark"})
else else
minetest.add_item(pos, "default:tree_bark") minetest.add_item(pos, "default:tree_bark")
end end
itemstack:add_wear(65535 / 299) -- 300 uses itemstack:add_wear(65535 / 299) -- 300 uses
end end
return itemstack return itemstack
end end
end, end,
}) }
)
minetest.register_craft({ minetest.register_craft(
{
output = "stripped_tree:chisel", output = "stripped_tree:chisel",
recipe = {{"","default:steel_ingot",""}, recipe = {{"", "default:steel_ingot", ""}, {"", "screwdriver:screwdriver", ""}, {"", "", ""}},
{"","screwdriver:screwdriver",""}, }
{"","",""}} )
})
end end

11
moreores.lua
View File

@@ -1,9 +1,4 @@
--Register axes -- Register axes
local axe_types = { local axe_types = {"axe_mithril", "axe_silver"}
"axe_mithril",
"axe_silver",
}
if not stripped_tree.ENABLE_CHISEL then if not stripped_tree.ENABLE_CHISEL then stripped_tree.register_axes("moreores", axe_types) end
stripped_tree.register_axes("moreores",axe_types)
end

55
moretrees.lua
View File

@@ -1,4 +1,4 @@
--Register stripped trees -- Register stripped trees
local mod_name = "moretrees" local mod_name = "moretrees"
local trunk_names = { local trunk_names = {
"beech_trunk", "beech_trunk",
@@ -15,61 +15,68 @@ local trunk_names = {
"rubber_tree_trunk", "rubber_tree_trunk",
"fir_trunk", "fir_trunk",
"jungletree_trunk", "jungletree_trunk",
} }
stripped_tree.register_trunk(mod_name,trunk_names) stripped_tree.register_trunk(mod_name, trunk_names)
--register tree variations using the same texture as default moretree trunks -- Register tree variations using the same texture as default moretree trunks
minetest.register_node(":"..mod_name..":stripped_date_palm_mfruit_trunk", { minetest.register_node(
":" .. mod_name .. ":stripped_date_palm_mfruit_trunk", {
description = "Stripped date_palm_fruit_trunk", description = "Stripped date_palm_fruit_trunk",
tiles = { tiles = {
"stripped_"..mod_name.."_date_palm_trunk_top.png", "stripped_" .. mod_name .. "_date_palm_trunk_top.png",
"stripped_"..mod_name.."_date_palm_trunk_top.png", "stripped_" .. mod_name .. "_date_palm_trunk_top.png",
"stripped_"..mod_name.."_date_palm_trunk.png" "stripped_" .. mod_name .. "_date_palm_trunk.png",
}, },
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, not_in_creative_inventory = 1}, groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, not_in_creative_inventory = 1},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
paramtype2 = "facedir", paramtype2 = "facedir",
on_place = minetest.rotate_node, on_place = minetest.rotate_node,
}) }
)
minetest.register_node(":"..mod_name..":stripped_date_palm_ffruit_trunk", { minetest.register_node(
":" .. mod_name .. ":stripped_date_palm_ffruit_trunk", {
description = "Stripped date_palm_fruit_trunk", description = "Stripped date_palm_fruit_trunk",
tiles = { tiles = {
"stripped_"..mod_name.."_date_palm_trunk_top.png", "stripped_" .. mod_name .. "_date_palm_trunk_top.png",
"stripped_"..mod_name.."_date_palm_trunk_top.png", "stripped_" .. mod_name .. "_date_palm_trunk_top.png",
"stripped_"..mod_name.."_date_palm_trunk.png" "stripped_" .. mod_name .. "_date_palm_trunk.png",
}, },
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, not_in_creative_inventory = 1}, groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, not_in_creative_inventory = 1},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
paramtype2 = "facedir", paramtype2 = "facedir",
on_place = minetest.rotate_node, on_place = minetest.rotate_node,
}) }
)
minetest.register_node(":"..mod_name..":stripped_date_palm_fruit_trunk", { minetest.register_node(
":" .. mod_name .. ":stripped_date_palm_fruit_trunk", {
description = "Stripped date_palm_fruit_trunk", description = "Stripped date_palm_fruit_trunk",
tiles = { tiles = {
"stripped_"..mod_name.."_date_palm_trunk_top.png", "stripped_" .. mod_name .. "_date_palm_trunk_top.png",
"stripped_"..mod_name.."_date_palm_trunk_top.png", "stripped_" .. mod_name .. "_date_palm_trunk_top.png",
"stripped_"..mod_name.."_date_palm_trunk.png" "stripped_" .. mod_name .. "_date_palm_trunk.png",
}, },
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, not_in_creative_inventory = 1}, groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, not_in_creative_inventory = 1},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
paramtype2 = "facedir", paramtype2 = "facedir",
on_place = minetest.rotate_node, on_place = minetest.rotate_node,
}) }
)
minetest.register_node(":"..mod_name..":stripped_rubber_tree_trunk_empty", { minetest.register_node(
":" .. mod_name .. ":stripped_rubber_tree_trunk_empty", {
description = "Stripped date_palm_fruit_trunk", description = "Stripped date_palm_fruit_trunk",
tiles = { tiles = {
"stripped_"..mod_name.."_rubber_tree_trunk_top.png", "stripped_" .. mod_name .. "_rubber_tree_trunk_top.png",
"stripped_"..mod_name.."_rubber_tree_trunk_top.png", "stripped_" .. mod_name .. "_rubber_tree_trunk_top.png",
"stripped_"..mod_name.."_rubber_tree_trunk.png" "stripped_" .. mod_name .. "_rubber_tree_trunk.png",
}, },
groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, not_in_creative_inventory = 1}, groups = {tree = 1, choppy = 2, oddly_breakable_by_hand = 1, flammable = 2, not_in_creative_inventory = 1},
sounds = default.node_sound_wood_defaults(), sounds = default.node_sound_wood_defaults(),
paramtype2 = "facedir", paramtype2 = "facedir",
on_place = minetest.rotate_node, on_place = minetest.rotate_node,
}) }
)