1
0
mirror of https://codeberg.org/tenplus1/mobs_redo.git synced 2025-05-07 19:47:11 +02:00

change minetest. to core.

This commit is contained in:
tenplus1 2025-05-04 12:25:59 +01:00
parent b977431e21
commit 43ad058efa
6 changed files with 291 additions and 291 deletions

376
api.lua

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
local S = minetest.get_translator("mobs")
local FS = function(...) return minetest.formspec_escape(S(...)) end
local mc2 = minetest.get_modpath("mcl_core")
local mod_def = minetest.get_modpath("default")
local S = core.get_translator("mobs")
local FS = function(...) return core.formspec_escape(S(...)) end
local mc2 = core.get_modpath("mcl_core")
local mod_def = core.get_modpath("default")
-- determine which sounds to use, default or mcl_sounds
@ -27,7 +27,7 @@ sound_helper("node_sound_glass_defaults")
-- mob repellent node
minetest.register_node("mobs:mob_repellent", {
core.register_node("mobs:mob_repellent", {
description = S("Mob Repellent"),
tiles = {"mobs_repellent.png"},
is_ground_content = false,
@ -39,7 +39,7 @@ minetest.register_node("mobs:mob_repellent", {
function mobs.add_eatable(item, hp)
local def = minetest.registered_items[item]
local def = core.registered_items[item]
if def then
@ -47,7 +47,7 @@ function mobs.add_eatable(item, hp)
groups.eatable = hp ; groups.flammable = 2
minetest.override_item(item, {groups = groups})
core.override_item(item, {groups = groups})
end
end
@ -72,13 +72,13 @@ local items = {
-- name tag
minetest.register_craftitem("mobs:nametag", {
core.register_craftitem("mobs:nametag", {
description = S("Name Tag") .. " " .. S("\nRight-click Mobs Redo mob to apply"),
inventory_image = "mobs_nametag.png",
groups = {flammable = 2, nametag = 1}
})
minetest.register_craft({
core.register_craft({
output = "mobs:nametag",
recipe = {
{ items.paper, items.dye_black, items.string }
@ -87,7 +87,7 @@ minetest.register_craft({
-- leather
minetest.register_craftitem("mobs:leather", {
core.register_craftitem("mobs:leather", {
description = S("Leather"),
inventory_image = "mobs_leather.png",
groups = {flammable = 2, leather = 1}
@ -95,10 +95,10 @@ minetest.register_craftitem("mobs:leather", {
-- raw meat
minetest.register_craftitem("mobs:meat_raw", {
core.register_craftitem("mobs:meat_raw", {
description = S("Raw Meat"),
inventory_image = "mobs_meat_raw.png",
on_use = minetest.item_eat(3),
on_use = core.item_eat(3),
groups = {food_meat_raw = 1}
})
@ -106,16 +106,16 @@ mobs.add_eatable("mobs:meat_raw", 3)
-- cooked meat
minetest.register_craftitem("mobs:meat", {
core.register_craftitem("mobs:meat", {
description = S("Meat"),
inventory_image = "mobs_meat.png",
on_use = minetest.item_eat(8),
on_use = core.item_eat(8),
groups = {food_meat = 1}
})
mobs.add_eatable("mobs:meat", 8)
minetest.register_craft({
core.register_craft({
type = "cooking",
output = "mobs:meat",
recipe = "mobs:meat_raw",
@ -124,13 +124,13 @@ minetest.register_craft({
-- lasso
minetest.register_tool("mobs:lasso", {
core.register_tool("mobs:lasso", {
description = S("Lasso (right-click animal to put in inventory)"),
inventory_image = "mobs_magic_lasso.png",
groups = {flammable = 2}
})
minetest.register_craft({
core.register_craft({
output = "mobs:lasso",
recipe = {
{ items.string, "", items.string},
@ -139,17 +139,17 @@ minetest.register_craft({
}
})
minetest.register_alias("mobs:magic_lasso", "mobs:lasso")
core.register_alias("mobs:magic_lasso", "mobs:lasso")
-- net
minetest.register_tool("mobs:net", {
core.register_tool("mobs:net", {
description = S("Net (right-click animal to put in inventory)"),
inventory_image = "mobs_net.png",
groups = {flammable = 2}
})
minetest.register_craft({
core.register_craft({
output = "mobs:net",
recipe = {
{ items.stick, "", items.stick },
@ -160,13 +160,13 @@ minetest.register_craft({
-- shears (right click to shear animal)
minetest.register_tool("mobs:shears", {
core.register_tool("mobs:shears", {
description = S("Steel Shears (right-click to shear)"),
inventory_image = "mobs_shears.png",
groups = {flammable = 2}
})
minetest.register_craft({
core.register_craft({
output = "mobs:shears",
recipe = {
{ "", items.steel_ingot, "" },
@ -176,13 +176,13 @@ minetest.register_craft({
-- protection rune
minetest.register_craftitem("mobs:protector", {
core.register_craftitem("mobs:protector", {
description = S("Mob Protection Rune"),
inventory_image = "mobs_protector.png",
groups = {flammable = 2}
})
minetest.register_craft({
core.register_craft({
output = "mobs:protector",
recipe = {
{ items.stone, items.stone, items.stone },
@ -193,13 +193,13 @@ minetest.register_craft({
-- protection rune (level 2)
minetest.register_craftitem("mobs:protector2", {
core.register_craftitem("mobs:protector2", {
description = S("Mob Protection Rune (Level 2)"),
inventory_image = "mobs_protector2.png",
groups = {flammable = 2}
})
minetest.register_craft({
core.register_craft({
output = "mobs:protector2",
recipe = {
{ "mobs:protector", items.mese_crystal, "mobs:protector" },
@ -210,13 +210,13 @@ minetest.register_craft({
-- saddle
minetest.register_craftitem("mobs:saddle", {
core.register_craftitem("mobs:saddle", {
description = S("Saddle"),
inventory_image = "mobs_saddle.png",
groups = {flammable = 2, saddle = 1}
})
minetest.register_craft({
core.register_craft({
output = "mobs:saddle",
recipe = {
{"group:leather", "group:leather", "group:leather"},
@ -244,7 +244,7 @@ end
-- mob fence top (has enlarged collisionbox to stop mobs getting over)
minetest.register_node("mobs:fence_top", {
core.register_node("mobs:fence_top", {
description = S("Mob Fence Top"),
drawtype = "nodebox",
tiles = {"default_wood.png"},
@ -257,7 +257,7 @@ minetest.register_node("mobs:fence_top", {
selection_box = {type = "fixed", fixed = {-0.4, -1.5, -0.4, 0.4, 0, 0.4}}
})
minetest.register_craft({
core.register_craft({
output = "mobs:fence_top 12",
recipe = {
{"group:wood", "group:wood", "group:wood"},
@ -267,13 +267,13 @@ minetest.register_craft({
-- items that can be used as fuel
minetest.register_craft({type = "fuel", recipe = "mobs:nametag", burntime = 3})
minetest.register_craft({type = "fuel", recipe = "mobs:lasso", burntime = 7})
minetest.register_craft({type = "fuel", recipe = "mobs:net", burntime = 8})
minetest.register_craft({type = "fuel", recipe = "mobs:leather", burntime = 4})
minetest.register_craft({type = "fuel", recipe = "mobs:saddle", burntime = 7})
minetest.register_craft({type = "fuel", recipe = "mobs:fence_wood", burntime = 7})
minetest.register_craft({type = "fuel", recipe = "mobs:fence_top", burntime = 2})
core.register_craft({type = "fuel", recipe = "mobs:nametag", burntime = 3})
core.register_craft({type = "fuel", recipe = "mobs:lasso", burntime = 7})
core.register_craft({type = "fuel", recipe = "mobs:net", burntime = 8})
core.register_craft({type = "fuel", recipe = "mobs:leather", burntime = 4})
core.register_craft({type = "fuel", recipe = "mobs:saddle", burntime = 7})
core.register_craft({type = "fuel", recipe = "mobs:fence_wood", burntime = 7})
core.register_craft({type = "fuel", recipe = "mobs:fence_top", burntime = 2})
-- this tool spawns same mob and adds owner, protected, nametag info
@ -282,7 +282,7 @@ minetest.register_craft({type = "fuel", recipe = "mobs:fence_top", burntime = 2}
local tex_obj
minetest.register_tool(":mobs:mob_reset_stick", {
core.register_tool(":mobs:mob_reset_stick", {
description = S("Mob Reset Stick"),
inventory_image = "default_stick.png^[colorize:#ff000050",
stack_max = 1,
@ -300,7 +300,7 @@ minetest.register_tool(":mobs:mob_reset_stick", {
if obj and not sneak then
local self = obj:get_luaentity()
local obj2 = minetest.add_entity(obj:get_pos(), self.name)
local obj2 = core.add_entity(obj:get_pos(), self.name)
if obj2 then
@ -336,7 +336,7 @@ minetest.register_tool(":mobs:mob_reset_stick", {
local name = user:get_player_name()
minetest.show_formspec(name, "mobs_texture", "size[8,4]"
core.show_formspec(name, "mobs_texture", "size[8,4]"
.. "field[0.5,1;7.5,0;name;"
.. FS("Enter texture:") .. ";" .. bt .. "]"
.. "button_exit[2.5,3.5;3,1;mob_texture_change;"
@ -345,7 +345,7 @@ minetest.register_tool(":mobs:mob_reset_stick", {
end
})
minetest.register_on_player_receive_fields(function(player, formname, fields)
core.register_on_player_receive_fields(function(player, formname, fields)
-- right-clicked with nametag and name entered?
if formname == "mobs_texture" and fields.name and fields.name ~= "" then
@ -375,22 +375,22 @@ end)
-- Meat Block
minetest.register_node("mobs:meatblock", {
core.register_node("mobs:meatblock", {
description = S("Meat Block"),
tiles = {"mobs_meat_top.png", "mobs_meat_bottom.png", "mobs_meat_side.png"},
paramtype2 = "facedir",
groups = {choppy = 1, oddly_breakable_by_hand = 1, axey = 1, handy = 1},
is_ground_content = false,
sounds = mobs.node_sound_dirt_defaults(),
on_place = minetest.rotate_node,
on_use = minetest.item_eat(20),
on_place = core.rotate_node,
on_use = core.item_eat(20),
_mcl_hardness = 0.8,
_mcl_blast_resistance = 1
})
mobs.add_eatable("mobs:meatblock", 20)
minetest.register_craft({
core.register_craft({
output = "mobs:meatblock",
recipe = {
{ items.meat_cooked, items.meat_cooked, items.meat_cooked },
@ -401,22 +401,22 @@ minetest.register_craft({
-- Meat Block (raw)
minetest.register_node("mobs:meatblock_raw", {
core.register_node("mobs:meatblock_raw", {
description = S("Raw Meat Block"),
tiles = {"mobs_meat_raw_top.png", "mobs_meat_raw_bottom.png", "mobs_meat_raw_side.png"},
paramtype2 = "facedir",
groups = {choppy = 1, oddly_breakable_by_hand = 1, axey = 1, handy = 1},
is_ground_content = false,
sounds = mobs.node_sound_dirt_defaults(),
on_place = minetest.rotate_node,
on_use = minetest.item_eat(20),
on_place = core.rotate_node,
on_use = core.item_eat(20),
_mcl_hardness = 0.8,
_mcl_blast_resistance = 1
})
mobs.add_eatable("mobs:meatblock_raw", 20)
minetest.register_craft({
core.register_craft({
output = "mobs:meatblock_raw",
recipe = {
{ items.meat_raw, items.meat_raw, items.meat_raw },
@ -425,7 +425,7 @@ minetest.register_craft({
}
})
minetest.register_craft({
core.register_craft({
type = "cooking",
output = "mobs:meatblock",
recipe = "mobs:meatblock_raw",
@ -434,9 +434,9 @@ minetest.register_craft({
-- hearing vines (if mesecons active it acts like blinkyplant)
local mod_mese = minetest.get_modpath("mesecons")
local mod_mese = core.get_modpath("mesecons")
minetest.register_node("mobs:hearing_vines", {
core.register_node("mobs:hearing_vines", {
description = S("Hearing Vines"),
drawtype = "firelike",
waving = 1,
@ -454,12 +454,12 @@ minetest.register_node("mobs:hearing_vines", {
},
on_sound = function(pos, def)
if def.loudness > 0.5 then
minetest.set_node(pos, {name = "mobs:hearing_vines_active"})
core.set_node(pos, {name = "mobs:hearing_vines_active"})
end
end
})
minetest.register_node("mobs:hearing_vines_active", {
core.register_node("mobs:hearing_vines_active", {
description = S("Active Hearing Vines"),
drawtype = "firelike",
waving = 1,
@ -479,11 +479,11 @@ minetest.register_node("mobs:hearing_vines_active", {
type = "fixed", fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, -0.25, 6 / 16},
},
on_construct = function(pos)
minetest.get_node_timer(pos):start(1)
core.get_node_timer(pos):start(1)
if mod_mese then mesecon.receptor_on(pos) end
end,
on_timer = function(pos)
minetest.set_node(pos, {name = "mobs:hearing_vines"})
core.set_node(pos, {name = "mobs:hearing_vines"})
if mod_mese then mesecon.receptor_off(pos) end
end
})

View File

@ -1,16 +1,16 @@
local S = minetest.get_translator("mobs")
local S = core.get_translator("mobs")
-- peaceful player privilege
minetest.register_privilege("peaceful_player", {
core.register_privilege("peaceful_player", {
description = "Prevents Mobs Redo mobs from attacking player",
give_to_singleplayer = false
})
-- fallback node
minetest.register_node("mobs:fallback_node", {
core.register_node("mobs:fallback_node", {
description = S("Fallback Node"),
tiles = {"mobs_fallback.png"},
is_ground_content = false,
@ -19,7 +19,7 @@ minetest.register_node("mobs:fallback_node", {
})
local path = minetest.get_modpath("mobs")
local path = core.get_modpath("mobs")
dofile(path .. "/api.lua") -- mob API
@ -31,7 +31,7 @@ dofile(path .. "/spawner.lua") -- mob spawner
-- Lucky Blocks
if minetest.get_modpath("lucky_block") then
if core.get_modpath("lucky_block") then
dofile(path .. "/lucky_block.lua")
end

View File

@ -1,5 +1,5 @@
local S = minetest.get_translator("mobs")
local S = core.get_translator("mobs")
-- add lucky blocks
@ -21,7 +21,7 @@ lucky_block:add_blocks({
-- pint sized rune, use on tamed mob to shrink to half-size
minetest.register_craftitem(":mobs:pint_sized_rune", {
core.register_craftitem(":mobs:pint_sized_rune", {
description = S("Pint Sized Rune"),
inventory_image = "mobs_pint_sized_rune.png",
groups = {flammable = 2},
@ -39,17 +39,17 @@ minetest.register_craftitem(":mobs:pint_sized_rune", {
local self = pointed_thing.ref:get_luaentity()
if not self._cmi_is_mob then
minetest.chat_send_player(name, S("Not a Mobs Redo mob!"))
core.chat_send_player(name, S("Not a Mobs Redo mob!"))
return
end
if not self.tamed then
minetest.chat_send_player(name, S("Not tamed!"))
core.chat_send_player(name, S("Not tamed!"))
return
end
if self.pint_size_potion then
minetest.chat_send_player(name, S("Potion already applied!"))
core.chat_send_player(name, S("Potion already applied!"))
return
end
@ -92,7 +92,7 @@ minetest.register_craftitem(":mobs:pint_sized_rune", {
end
})
minetest.register_craft({
core.register_craft({
output = "lucky_block:pint_sized_rune",
recipe = {{"lucky_block:pint_sized_potion", "mobs:protector"}}
})

View File

@ -1,11 +1,11 @@
-- lib_mount by Blert2112 (edited by TenPlus1)
local is_mc2 = minetest.get_modpath("mcl_mobs") -- MineClone2 check
local is_mc2 = core.get_modpath("mcl_mobs") -- MineClone2 check
-- one of these is needed to ride mobs, otherwise no riding for you
if not minetest.get_modpath("player_api") and not is_mc2 then
if not core.get_modpath("player_api") and not is_mc2 then
function mobs.attach() end
function mobs.detach() end
@ -28,7 +28,7 @@ local function node_is(entity)
if entity.standing_on == "air" then return "air" end
local def = minetest.registered_nodes[entity.standing_on]
local def = core.registered_nodes[entity.standing_on]
if def.groups.lava then return "lava" end
if def.groups.liquid then return "liquid" end
@ -90,15 +90,15 @@ end
-- detach player on leaving
minetest.register_on_leaveplayer(function(player)
core.register_on_leaveplayer(function(player)
force_detach(player)
end)
-- detatch all players on shutdown
minetest.register_on_shutdown(function()
core.register_on_shutdown(function()
local players = minetest.get_connected_players()
local players = core.get_connected_players()
for i = 1, #players do
force_detach(players[i])
@ -107,7 +107,7 @@ end)
-- detatch player when dead
minetest.register_on_dieplayer(function(player)
core.register_on_dieplayer(function(player)
force_detach(player)
return true
end)
@ -125,11 +125,11 @@ local function find_free_pos(pos)
for _, c in pairs(check) do
local npos = {x = pos.x + c.x, y = pos.y + c.y, z = pos.z + c.z}
local node = minetest.get_node_or_nil(npos)
local node = core.get_node_or_nil(npos)
if node and node.name then
local def = minetest.registered_nodes[node.name]
local def = core.registered_nodes[node.name]
if def and not def.walkable and def.liquidtype == "none" then
return npos
@ -144,7 +144,7 @@ end
local function is_player(player)
if player and type(player) == "userdata" and minetest.is_player(player) then
if player and type(player) == "userdata" and core.is_player(player) then
return true
end
end
@ -184,7 +184,7 @@ function mobs.attach(entity, player)
visual_size = {x = entity.driver_scale.x, y = entity.driver_scale.y}
})
minetest.after(0.2, function()
core.after(0.2, function()
if is_player(player) then
@ -205,7 +205,7 @@ function mobs.detach(player)
force_detach(player)
minetest.after(0.1, function()
core.after(0.1, function()
if player and player:is_player() then
@ -299,7 +299,7 @@ function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
if velo.y == 0
and entity.standing_on ~= "air" and entity.standing_on ~= "ignore"
and minetest.get_item_group(entity.standing_on, "liquid") == 0 then
and core.get_item_group(entity.standing_on, "liquid") == 0 then
velo.y = velo.y + entity.jump_height
acce_y = acce_y + (acce_y * 3) + 1
end
@ -391,7 +391,7 @@ function mobs.drive(entity, moving_anim, stand_anim, can_fly, dtime)
new_acce.y = 0
p.y = p.y + 1
if minetest.get_item_group(entity.standing_in, "liquid") ~= 0 then
if core.get_item_group(entity.standing_in, "liquid") ~= 0 then
if velo.y >= 5 then
velo.y = 5
@ -458,7 +458,7 @@ function mobs.fly(entity, _, speed, shoots, arrow, moving_anim, stand_anim)
if ctrl.LMB and ctrl.sneak and shoots then
local pos = entity.object:get_pos()
local obj = minetest.add_entity({
local obj = core.add_entity({
x = pos.x + 0 + dir.x * 2.5,
y = pos.y + 1.5 + dir.y,
z = pos.z + 0 + dir.z * 2.5}, arrow)

View File

@ -1,12 +1,12 @@
local S = minetest.get_translator("mobs")
local max_per_block = tonumber(minetest.settings:get("max_objects_per_block") or 99)
local S = core.get_translator("mobs")
local max_per_block = tonumber(core.settings:get("max_objects_per_block") or 99)
-- helper functions
local function is_player(player)
if player and type(player) == "userdata" and minetest.is_player(player) then
if player and type(player) == "userdata" and core.is_player(player) then
return true
end
end
@ -26,7 +26,7 @@ end
local spawner_default = "mobs_animal:pumba 10 15 0 0 0"
minetest.register_node("mobs:spawner", {
core.register_node("mobs:spawner", {
tiles = {"mob_spawner.png"},
drawtype = "glasslike",
paramtype = "light",
@ -40,7 +40,7 @@ minetest.register_node("mobs:spawner", {
on_construct = function(pos)
local meta = minetest.get_meta(pos)
local meta = core.get_meta(pos)
-- setup formspec
local head = S("(mob name) (min light) (max light) (amount)"
@ -48,7 +48,7 @@ minetest.register_node("mobs:spawner", {
-- text entry formspec
meta:set_string("formspec", "size[10,3.5]"
.. "label[0.15,0.5;" .. minetest.formspec_escape(head) .. "]"
.. "label[0.15,0.5;" .. core.formspec_escape(head) .. "]"
.. "field[1,2.5;8.5,0.8;text;" .. S("Command:")
.. ";${command}]")
@ -58,19 +58,19 @@ minetest.register_node("mobs:spawner", {
on_right_click = function(pos, placer)
if minetest.is_protected(pos, placer:get_player_name()) then return end
if core.is_protected(pos, placer:get_player_name()) then return end
end,
on_receive_fields = function(pos, formname, fields, sender)
if not fields.text or fields.text == "" then return end
local meta = minetest.get_meta(pos)
local meta = core.get_meta(pos)
local comm = fields.text:split(" ")
local name = sender:get_player_name()
if minetest.is_protected(pos, name) then
minetest.record_protection_violation(pos, name)
if core.is_protected(pos, name) then
core.record_protection_violation(pos, name)
return
end
@ -88,8 +88,8 @@ minetest.register_node("mobs:spawner", {
meta:set_string("command", fields.text)
meta:set_string("infotext", S("Spawner Active (@1)", mob))
else
minetest.chat_send_player(name, S("Mob Spawner settings failed!"))
minetest.chat_send_player(name,
core.chat_send_player(name, S("Mob Spawner settings failed!"))
core.chat_send_player(name,
S("Syntax: “name min_light[0-14] max_light[0-14] "
.. "max_mobs_in_area[0 to disable] player_distance[1-20] "
.. "y_offset[-10 to 10]”"))
@ -99,7 +99,7 @@ minetest.register_node("mobs:spawner", {
-- spawner abm
minetest.register_abm({
core.register_abm({
label = "Mob spawner node",
nodenames = {"mobs:spawner"},
interval = 10,
@ -112,7 +112,7 @@ minetest.register_abm({
if active_object_count_wider >= max_per_block then return end
-- get meta and command
local meta = minetest.get_meta(pos)
local meta = core.get_meta(pos)
local comm = meta:get_string("command"):split(" ")
-- get settings from command
@ -133,7 +133,7 @@ minetest.register_abm({
end
-- check objects inside 9x9 area around spawner
local objs = minetest.get_objects_inside_radius(pos, 9)
local objs = core.get_objects_inside_radius(pos, 9)
local count = 0
local ent
@ -152,7 +152,7 @@ minetest.register_abm({
if pla > 0 then
local in_range, player
local players = minetest.get_connected_players()
local players = core.get_connected_players()
for i = 1, #players do
@ -171,12 +171,12 @@ minetest.register_abm({
end
-- set medium mob usually spawns in (defaults to air)
local reg = minetest.registered_entities[mob].fly_in
local reg = core.registered_entities[mob].fly_in
if not reg or type(reg) == "string" then reg = {(reg or "air")} end
-- find air blocks within 5 nodes of spawner
local air = minetest.find_nodes_in_area(
local air = core.find_nodes_in_area(
{x = pos.x - 5, y = pos.y + yof, z = pos.z - 5},
{x = pos.x + 5, y = pos.y + yof, z = pos.z + 5}, reg)
@ -184,13 +184,13 @@ minetest.register_abm({
if air and #air > 0 then
local pos2 = air[math.random(#air)]
local lig = minetest.get_node_light(pos2) or 0
local lig = core.get_node_light(pos2) or 0
pos2.y = pos2.y + 0.5
-- only if light levels are within range
if lig >= mlig and lig <= xlig and minetest.registered_entities[mob] then
minetest.add_entity(pos2, mob)
if lig >= mlig and lig <= xlig and core.registered_entities[mob] then
core.add_entity(pos2, mob)
end
end
end