Use core instead of minetest
`core` is the preferred object to use, existing since Minetest 0.4 or something; `minetest` is just a backwards compatibility alias for it.
This commit is contained in:
@@ -12,7 +12,7 @@ read_globals = {
|
||||
table = {fields = {"copy", "getn"}},
|
||||
|
||||
-- Builtin
|
||||
"minetest", "core", "vector", "ItemStack",
|
||||
"core", "vector", "ItemStack",
|
||||
"dump", "DIR_DELIM", "VoxelArea", "Settings",
|
||||
|
||||
-- MTG
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
local max_stack = tonumber(minetest.settings:get("default_stack_max")) or 99
|
||||
local max_stack = tonumber(core.settings:get("default_stack_max")) or 99
|
||||
|
||||
-- LuaFormatter off
|
||||
local machine_formspec = "" ..
|
||||
@@ -14,7 +14,7 @@ local machine_formspec = "" ..
|
||||
"listring[current_player;main]"
|
||||
-- LuaFormatter on
|
||||
|
||||
minetest.register_node(
|
||||
core.register_node(
|
||||
"stripped_tree:chiseling_machine", {
|
||||
description = "Chiseling machine",
|
||||
tiles = {
|
||||
@@ -28,19 +28,19 @@ minetest.register_node(
|
||||
groups = {cracky = 1},
|
||||
|
||||
after_place_node = function(pos, placer)
|
||||
local meta = minetest.get_meta(pos)
|
||||
local meta = core.get_meta(pos)
|
||||
meta:set_string("formspec", machine_formspec)
|
||||
end,
|
||||
|
||||
on_construct = function(pos)
|
||||
local inv = minetest.get_meta(pos):get_inventory()
|
||||
local inv = core.get_meta(pos):get_inventory()
|
||||
inv:set_size("src", 1)
|
||||
inv:set_size("dst", 2)
|
||||
minetest.get_node_timer(pos):start(1.0)
|
||||
core.get_node_timer(pos):start(1.0)
|
||||
end,
|
||||
|
||||
on_metadata_inventory_put = function(pos, listname, index, stack, player)
|
||||
local inv = minetest.get_meta(pos):get_inventory()
|
||||
local inv = core.get_meta(pos):get_inventory()
|
||||
local src_stack = inv:get_stack("src", 1)
|
||||
local dst_stack = inv:get_stack("dst", 1)
|
||||
if listname == "src" and not src_stack:is_empty() then
|
||||
@@ -48,7 +48,7 @@ minetest.register_node(
|
||||
local src_count = src_stack:get_count()
|
||||
local mod_name, node_name = unpack(src_name:split(":"))
|
||||
local stripped_name = mod_name .. ":stripped_" .. node_name
|
||||
local has_stripped = minetest.registered_nodes[stripped_name]
|
||||
local has_stripped = core.registered_nodes[stripped_name]
|
||||
local dst_count = dst_stack:get_count()
|
||||
if has_stripped and dst_count < max_stack then
|
||||
inv:add_item("dst", stripped_name .. " " .. src_count)
|
||||
@@ -69,7 +69,7 @@ minetest.register_node(
|
||||
}
|
||||
)
|
||||
|
||||
minetest.register_craft(
|
||||
core.register_craft(
|
||||
{
|
||||
output = "stripped_tree:chiseling_machine",
|
||||
recipe = {
|
||||
|
||||
14
default.lua
14
default.lua
@@ -1,15 +1,15 @@
|
||||
-- Register tree bark
|
||||
minetest.register_craftitem(
|
||||
core.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})
|
||||
core.register_craft({type = "fuel", recipe = "default:tree_bark", burntime = 15})
|
||||
|
||||
-- Register craft for string
|
||||
if minetest.get_modpath("farming") then
|
||||
minetest.register_craft(
|
||||
if core.get_modpath("farming") then
|
||||
core.register_craft(
|
||||
{
|
||||
output = "farming:string 4",
|
||||
recipe = {
|
||||
@@ -22,7 +22,7 @@ if minetest.get_modpath("farming") then
|
||||
end
|
||||
|
||||
-- Register craft for paper
|
||||
minetest.register_craft(
|
||||
core.register_craft(
|
||||
{
|
||||
output = "default:paper 8",
|
||||
recipe = {
|
||||
@@ -34,8 +34,8 @@ minetest.register_craft(
|
||||
)
|
||||
|
||||
-- Register craft for mulch
|
||||
if minetest.get_modpath("bonemeal") then
|
||||
minetest.register_craft(
|
||||
if core.get_modpath("bonemeal") then
|
||||
core.register_craft(
|
||||
{
|
||||
output = "bonemeal:mulch 4",
|
||||
recipe = {
|
||||
|
||||
@@ -4,24 +4,24 @@ stripped_tree = {}
|
||||
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 = core.settings:get_bool("creative_mode")
|
||||
|
||||
-- Function to verify that stripped tree trunk exists
|
||||
stripped_tree.has_stripped = function(pos)
|
||||
local node = minetest.get_node(pos).name or pos
|
||||
local node = core.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 = core.registered_nodes[mod_name .. ":" .. "stripped_" .. node_name]
|
||||
|
||||
return has_stripped
|
||||
end
|
||||
|
||||
-- Function to swap nodes
|
||||
stripped_tree.swap_node = function(pos, user, in_creative_mode, tool)
|
||||
local old_node = minetest.get_node(pos).name
|
||||
local old_node = core.get_node(pos).name
|
||||
local mod_name, node_name = unpack(old_node:split(":"))
|
||||
local stripped = mod_name .. ":" .. "stripped_" .. node_name
|
||||
|
||||
minetest.swap_node(pos, {name = stripped, param2 = old_node.param2})
|
||||
core.swap_node(pos, {name = stripped, param2 = old_node.param2})
|
||||
-- itemstack:add_wear(65535 / 299) this is not useful at moment.
|
||||
|
||||
if not in_creative_mode then
|
||||
@@ -31,7 +31,7 @@ stripped_tree.swap_node = function(pos, user, in_creative_mode, tool)
|
||||
if inv:room_for_item("main", "default:tree_bark") then
|
||||
inv:add_item("main", {name = "default:tree_bark"})
|
||||
else
|
||||
minetest.add_item(pos, "default:tree_bark")
|
||||
core.add_item(pos, "default:tree_bark")
|
||||
end
|
||||
end
|
||||
|
||||
@@ -41,7 +41,7 @@ end
|
||||
-- Function to register nodes
|
||||
function stripped_tree.register_trunk(mod_name, trunk_names)
|
||||
for _, name in ipairs(trunk_names) do
|
||||
minetest.register_node(
|
||||
core.register_node(
|
||||
":" .. mod_name .. ":stripped_" .. name, {
|
||||
description = "Stripped " .. name,
|
||||
tiles = {
|
||||
@@ -58,11 +58,11 @@ function stripped_tree.register_trunk(mod_name, trunk_names)
|
||||
},
|
||||
sounds = default.node_sound_wood_defaults(),
|
||||
paramtype2 = "facedir",
|
||||
on_place = minetest.rotate_node,
|
||||
on_place = core.rotate_node,
|
||||
}
|
||||
)
|
||||
|
||||
minetest.register_craft(
|
||||
core.register_craft(
|
||||
{
|
||||
output = mod_name .. ":" .. name,
|
||||
recipe = {
|
||||
@@ -79,7 +79,7 @@ end
|
||||
if stripped_tree.ENABLE_CHISEL ~= true then
|
||||
function stripped_tree.register_axes(mod_n, axe_types)
|
||||
for _, axe_name in ipairs(axe_types) do
|
||||
minetest.override_item(
|
||||
core.override_item(
|
||||
mod_n .. ":" .. axe_name, {
|
||||
on_place = function(itemstack, user, pointed_thing)
|
||||
if pointed_thing.type ~= "node" then return end
|
||||
@@ -87,8 +87,8 @@ if stripped_tree.ENABLE_CHISEL ~= true then
|
||||
local pos = pointed_thing.under
|
||||
local pname = user:get_player_name()
|
||||
|
||||
if minetest.is_protected(pos, pname) then
|
||||
minetest.record_protection_violation(pos, pname)
|
||||
if core.is_protected(pos, pname) then
|
||||
core.record_protection_violation(pos, pname)
|
||||
return
|
||||
end
|
||||
|
||||
|
||||
26
init.lua
26
init.lua
@@ -1,5 +1,5 @@
|
||||
-- Get our own path
|
||||
local mpath = minetest.get_modpath("stripped_tree")
|
||||
local mpath = core.get_modpath("stripped_tree")
|
||||
|
||||
-- Load functions
|
||||
dofile(mpath .. "/functions.lua")
|
||||
@@ -9,14 +9,14 @@ dofile(mpath .. "/default.lua")
|
||||
dofile(mpath .. "/chiseling_machine.lua")
|
||||
|
||||
-- Load optional dependencies
|
||||
if minetest.get_modpath("moretrees") then dofile(mpath .. "/moretrees.lua") end
|
||||
if core.get_modpath("moretrees") then dofile(mpath .. "/moretrees.lua") end
|
||||
|
||||
if minetest.get_modpath("ethereal") then dofile(mpath .. "/ethereal.lua") end
|
||||
if core.get_modpath("ethereal") then dofile(mpath .. "/ethereal.lua") end
|
||||
|
||||
if minetest.get_modpath("moreores") then dofile(mpath .. "/moreores.lua") end
|
||||
if core.get_modpath("moreores") then dofile(mpath .. "/moreores.lua") end
|
||||
|
||||
if stripped_tree.ENABLE_CHISEL then
|
||||
minetest.register_tool(
|
||||
core.register_tool(
|
||||
"stripped_tree:chisel", {
|
||||
description = "Chisel for tree trunks",
|
||||
inventory_image = "chisel.png",
|
||||
@@ -29,32 +29,32 @@ if stripped_tree.ENABLE_CHISEL then
|
||||
local pos = pointed_thing.under
|
||||
local pname = user:get_player_name()
|
||||
|
||||
if minetest.is_protected(pos, pname) then
|
||||
minetest.record_protection_violation(pos, pname)
|
||||
if core.is_protected(pos, pname) then
|
||||
core.record_protection_violation(pos, pname)
|
||||
return
|
||||
end
|
||||
|
||||
local node = minetest.get_node(pos).name
|
||||
local node = core.get_node(pos).name
|
||||
local mod_name, node_name = unpack(node:split(":"))
|
||||
|
||||
-- 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 = core.registered_nodes[mod_name .. ":" .. "stripped_" .. node_name]
|
||||
|
||||
if has_stripped then
|
||||
local stripped = mod_name .. ":" .. "stripped_" .. node_name
|
||||
minetest.swap_node(pos, {name = stripped})
|
||||
core.swap_node(pos, {name = stripped})
|
||||
|
||||
if not minetest.settings:get_bool("creative_mode") then
|
||||
if not core.settings:get_bool("creative_mode") then
|
||||
local inv = user:get_inventory()
|
||||
|
||||
-- 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"})
|
||||
else
|
||||
minetest.add_item(pos, "default:tree_bark")
|
||||
core.add_item(pos, "default:tree_bark")
|
||||
end
|
||||
|
||||
itemstack:add_wear(65535 / 299) -- 300 uses
|
||||
@@ -66,7 +66,7 @@ if stripped_tree.ENABLE_CHISEL then
|
||||
}
|
||||
)
|
||||
|
||||
minetest.register_craft(
|
||||
core.register_craft(
|
||||
{
|
||||
output = "stripped_tree:chisel",
|
||||
recipe = {{"", "default:steel_ingot", ""}, {"", "screwdriver:screwdriver", ""}, {"", "", ""}},
|
||||
|
||||
@@ -21,7 +21,7 @@ stripped_tree.register_trunk(mod_name, trunk_names)
|
||||
|
||||
-- Register tree variations using the same texture as default moretree trunks
|
||||
|
||||
minetest.register_node(
|
||||
core.register_node(
|
||||
":" .. mod_name .. ":stripped_date_palm_mfruit_trunk", {
|
||||
description = "Stripped date_palm_fruit_trunk",
|
||||
tiles = {
|
||||
@@ -32,11 +32,11 @@ minetest.register_node(
|
||||
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,
|
||||
on_place = core.rotate_node,
|
||||
}
|
||||
)
|
||||
|
||||
minetest.register_node(
|
||||
core.register_node(
|
||||
":" .. mod_name .. ":stripped_date_palm_ffruit_trunk", {
|
||||
description = "Stripped date_palm_fruit_trunk",
|
||||
tiles = {
|
||||
@@ -47,11 +47,11 @@ minetest.register_node(
|
||||
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,
|
||||
on_place = core.rotate_node,
|
||||
}
|
||||
)
|
||||
|
||||
minetest.register_node(
|
||||
core.register_node(
|
||||
":" .. mod_name .. ":stripped_date_palm_fruit_trunk", {
|
||||
description = "Stripped date_palm_fruit_trunk",
|
||||
tiles = {
|
||||
@@ -62,11 +62,11 @@ minetest.register_node(
|
||||
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,
|
||||
on_place = core.rotate_node,
|
||||
}
|
||||
)
|
||||
|
||||
minetest.register_node(
|
||||
core.register_node(
|
||||
":" .. mod_name .. ":stripped_rubber_tree_trunk_empty", {
|
||||
description = "Stripped date_palm_fruit_trunk",
|
||||
tiles = {
|
||||
@@ -77,6 +77,6 @@ minetest.register_node(
|
||||
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,
|
||||
on_place = core.rotate_node,
|
||||
}
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user