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
8 changed files with 315 additions and 276 deletions
Showing only changes of commit 2eddcca11c - Show all commits

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

View File

@@ -1,13 +1,24 @@
local max_stack = tonumber(minetest.settings:get("default_stack_max")) or 99
minetest.register_node("stripped_tree:chiseling_machine", {
minetest.register_node(
"stripped_tree:chiseling_machine", {
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},
after_place_node = function(pos, placer)
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",
"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]"
)
end,
on_construct = function(pos)
@@ -43,14 +54,17 @@ minetest.register_node("stripped_tree:chiseling_machine", {
allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
return count
end
})
end,
}
)
minetest.register_craft({
minetest.register_craft(
{
output = "stripped_tree:chiseling_machine",
recipe = {
{"group:wood","default:diamond","group:wood"},
{"group:wood","stripped_tree:chisel","group:wood"},
{"group:wood", "group:wood","group:wood"},
{"group:wood", "default:diamond", "group:wood"},
{"group:wood", "stripped_tree:chisel", "group:wood"},
{"group:wood", "group:wood", "group:wood"},
},
})
}
)

View File

@@ -1,68 +1,59 @@
--Register tree bark
minetest.register_craftitem(":default:tree_bark", {
description = "Tree bark",
inventory_image = "tree_bark.png",
groups = {not_in_creative_inventory = 1}
})
--register bark as fuel
minetest.register_craft({
type = "fuel",
recipe = "default:tree_bark",
burntime = 15,
})
-- Register tree bark
minetest.register_craftitem(
":default:tree_bark",
{description = "Tree bark", inventory_image = "tree_bark.png", 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 craft for string
if minetest.get_modpath("farming") then
minetest.register_craft({
minetest.register_craft(
{
output = "farming:string 4",
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"}}
})
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
--Register craft for paper
minetest.register_craft({
-- Register craft for paper
minetest.register_craft(
{
output = "default:paper 8",
recipe = {{"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"}}
})
recipe = {
{"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
minetest.register_craft({
minetest.register_craft(
{
output = "bonemeal:mulch 4",
recipe = {{"default:tree_bark","default:tree_bark","default:tree_bark"},
{"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"},
{"", "", ""},
},
}
)
end
--Register stripped trees
-- Register stripped trees
local mod_name = "default"
local trunk_names = {
"tree",
"jungletree",
"aspen_tree",
"acacia_tree",
"pine_tree",
}
local trunk_names = {"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

View File

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

View File

@@ -1,28 +1,28 @@
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"
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)
local node = minetest.get_node(pos).name or pos
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
end
--Function to swap nodes
stripped_tree.swap_node = function(pos,user,creative_mode)
-- Function to swap nodes
stripped_tree.swap_node = function(pos, user, creative_mode)
local old_node = minetest.get_node(pos)
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.
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.
if not creative_mode then
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
inv:add_item("main", {name="default:tree_bark"})
inv:add_item("main", {name = "default:tree_bark"})
else
minetest.add_item(pos, "default:tree_bark")
end
@@ -32,40 +32,51 @@ stripped_tree.swap_node = function(pos,user,creative_mode)
end
--function to register nodes
function stripped_tree.register_trunk(mod_name,trunk_names)
-- function to register nodes
function stripped_tree.register_trunk(mod_name, trunk_names)
for _, name in ipairs(trunk_names) do
minetest.register_node(":"..mod_name..":stripped_" .. name, {
description = "Stripped "..name,
minetest.register_node(
":" .. mod_name .. ":stripped_" .. name, {
description = "Stripped " .. name,
tiles = {
"stripped_"..mod_name.."_"..name.."_top.png",
"stripped_"..mod_name.."_"..name.."_top.png",
"stripped_"..mod_name.."_"..name..".png"
"stripped_" .. mod_name .. "_" .. name .. "_top.png",
"stripped_" .. mod_name .. "_" .. name .. "_top.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(),
paramtype2 = "facedir",
on_place = minetest.rotate_node,
})
}
)
minetest.register_craft({
output = mod_name..":"..name,
recipe = {{"","default:tree_bark",""},
{"default:tree_bark",mod_name..":stripped_" .. name,"default:tree_bark"},
{"","default:tree_bark",""}}
})
minetest.register_craft(
{
output = mod_name .. ":" .. name,
recipe = {
{"", "default:tree_bark", ""},
{"default:tree_bark", mod_name .. ":stripped_" .. name, "default:tree_bark"},
{"", "default:tree_bark", ""},
},
}
)
end
end
--function to override axes
-- function to override axes
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
minetest.override_item(mod_n..":" .. axe_name, {
minetest.override_item(
mod_n .. ":" .. axe_name, {
on_place = 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 pname = user:get_player_name()
@@ -76,11 +87,12 @@ if stripped_tree.ENABLE_CHISEL ~= true then
end
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

View File

@@ -1,32 +1,24 @@
-- get modpath
local mpath = minetest.get_modpath("stripped_tree")
-- load functions
dofile(mpath .. "/functions.lua")
--load default
-- load default
dofile(mpath .. "/default.lua")
dofile(mpath .. "/chiseling_machine.lua")
--load optional dependencies
if minetest.get_modpath("moretrees") then
dofile(mpath .. "/moretrees.lua")
end
-- load optional dependencies
if minetest.get_modpath("moretrees") then dofile(mpath .. "/moretrees.lua") end
if minetest.get_modpath("ethereal") then
dofile(mpath .. "/ethereal.lua")
end
if minetest.get_modpath("ethereal") then dofile(mpath .. "/ethereal.lua") end
if minetest.get_modpath("moreores") then
dofile(mpath .. "/moreores.lua")
end
if minetest.get_modpath("moreores") then dofile(mpath .. "/moreores.lua") end
if stripped_tree.ENABLE_CHISEL then
minetest.register_tool("stripped_tree:chisel", {
minetest.register_tool(
"stripped_tree:chisel", {
description = "Chisel for tree trunks",
inventory_image = "chisel.png",
wield_image = "chisel.png",
@@ -34,9 +26,7 @@ if stripped_tree.ENABLE_CHISEL then
stack_max = 1,
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 pname = user:get_player_name()
@@ -51,17 +41,17 @@ if stripped_tree.ENABLE_CHISEL then
-- before concatenating check for nil
if not mod_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
local stripped = mod_name..":".."stripped_"..node_name
minetest.swap_node(pos,{name=stripped})
local stripped = mod_name .. ":" .. "stripped_" .. node_name
minetest.swap_node(pos, {name = stripped})
if not minetest.settings:get_bool("creative_mode") then
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
inv:add_item("main", {name="default:tree_bark"})
inv:add_item("main", {name = "default:tree_bark"})
else
minetest.add_item(pos, "default:tree_bark")
end
@@ -72,12 +62,13 @@ if stripped_tree.ENABLE_CHISEL then
end
end,
})
}
)
minetest.register_craft({
minetest.register_craft(
{
output = "stripped_tree:chisel",
recipe = {{"","default:steel_ingot",""},
{"","screwdriver:screwdriver",""},
{"","",""}}
})
recipe = {{"", "default:steel_ingot", ""}, {"", "screwdriver:screwdriver", ""}, {"", "", ""}},
}
)
end

View File

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

View File

@@ -1,4 +1,4 @@
--Register stripped trees
-- Register stripped trees
local mod_name = "moretrees"
local trunk_names = {
"beech_trunk",
@@ -18,58 +18,66 @@ local trunk_names = {
}
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",
tiles = {
"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_top.png",
"stripped_" .. mod_name .. "_date_palm_trunk_top.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},
sounds = default.node_sound_wood_defaults(),
paramtype2 = "facedir",
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",
tiles = {
"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_top.png",
"stripped_" .. mod_name .. "_date_palm_trunk_top.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},
sounds = default.node_sound_wood_defaults(),
paramtype2 = "facedir",
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",
tiles = {
"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_top.png",
"stripped_" .. mod_name .. "_date_palm_trunk_top.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},
sounds = default.node_sound_wood_defaults(),
paramtype2 = "facedir",
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",
tiles = {
"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_top.png",
"stripped_" .. mod_name .. "_rubber_tree_trunk_top.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},
sounds = default.node_sound_wood_defaults(),
paramtype2 = "facedir",
on_place = minetest.rotate_node,
})
}
)